projects
/
platform
/
upstream
/
libexif.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a comment regarding malformed UTF-16 strings.
[platform/upstream/libexif.git]
/
libexif
/
exif-entry.c
diff --git
a/libexif/exif-entry.c
b/libexif/exif-entry.c
index
5848d4a
..
c2980ea
100644
(file)
--- 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);
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 */
utf16[e->size/sizeof(unsigned short)] = 0;
/* Warning! The texts are converted from UTF16 to UTF8 */