From: Dan Fandrich Date: Fri, 18 May 2018 16:09:24 +0000 (+0200) Subject: Added a comment regarding malformed UTF-16 strings. X-Git-Tag: libexif-0_6_22-release~41 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Flibexif.git;a=commitdiff_plain;h=37a9fd9b5dd0fa3225a22b864dc50e5ea01565d8 Added a comment regarding malformed UTF-16 strings. --- diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c index 5848d4a..c2980ea 100644 --- a/libexif/exif-entry.c +++ b/libexif/exif-entry.c @@ -1378,6 +1378,10 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen) utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(unsigned short)); if (!utf16) break; memcpy(utf16, e->data, e->size); + + /* NUL terminate the string. If the size is odd (which isn't possible + * for a UTF16 string), then this will overwrite the final garbage byte. + */ utf16[e->size/sizeof(unsigned short)] = 0; /* Warning! The texts are converted from UTF16 to UTF8 */