android: jpeg: exif: Sanitize ASCII strings with utils::toAscii()

Use the newly introduced utils::toAscii() utility to remove all
non-ASCII characters for EXIF_FORMAT_ASCII strings.

Signed-off-by: Umang Jain <email@uajain.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

1 files changed, 21 insertions, 4 deletions

diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp
index 3fd5d556..e4a116df 100644
--- a/src/android/jpeg/exif.cpp
+++ b/src/android/jpeg/exif.cpp
@@ -8,6 +8,7 @@
 #include "exif.h"
 
 #include "libcamera/internal/log.h"
+#include "libcamera/internal/utils.h"
 
 using namespace libcamera;
 
@@ -171,15 +172,31 @@ void Exif::setRational(ExifIfd ifd, ExifTag tag, ExifRational item)
 
 void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::string &item)
 {
-	/* Pad 1 extra byte for null-terminated string in ASCII format. */
-	size_t length = format == EXIF_FORMAT_ASCII ?
-			item.length() + 1 : item.length();
+	std::string ascii;
+	size_t length;
+	const char *str;
+
+	if (format == EXIF_FORMAT_ASCII) {
+		ascii = utils::toAscii(item);
+		str = ascii.c_str();
+
+		/* Pad 1 extra byte to null-terminate the ASCII string. */
+		length = ascii.length() + 1;
+	} else {
+		str = item.c_str();
+
+		/*
+		 * Strings stored in different formats (EXIF_FORMAT_UNDEFINED)
+		 * are not null-terminated.
+		 */
+		length = item.length();
+	}
 
 	ExifEntry *entry = createEntry(ifd, tag, format, length, length);
 	if (!entry)
 		return;
 
-	memcpy(entry->data, item.c_str(), length);
+	memcpy(entry->data, str, length);
 	exif_entry_unref(entry);
 }