Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-26 10:05:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Umang Jain 2020-10-06 11:14:59 +05:30 • committed by Kieran Bingham
parent c57622d95f
commit 6feebf297e
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/android/jpeg/exif.cpp
View file

@ -8,6 +8,7 @@
#include "exif.h" #include "exif.h"
#include "libcamera/internal/log.h" #include "libcamera/internal/log.h"
#include "libcamera/internal/utils.h"
using namespace libcamera; 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) void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::string &item)
{ {
/* Pad 1 extra byte for null-terminated string in ASCII format. */ std::string ascii;
size_t length = format == EXIF_FORMAT_ASCII ? size_t length;
item.length() + 1 : item.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); ExifEntry *entry = createEntry(ifd, tag, format, length, length);
if (!entry) if (!entry)
return; return;
memcpy(entry->data, item.c_str(), length); memcpy(entry->data, str, length);
exif_entry_unref(entry); exif_entry_unref(entry);
} }