diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-11-19 18:56:34 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-11-19 18:56:34 +0000 |
commit | 9a6bc83a73d4609b0e059eb1d355e39947ca9cec (patch) | |
tree | 9d3ec28d5531f84294d805b27476f2e62c9d88be | |
parent | 28c8975af844098b8b19041ebec6d5c4cf4adb74 (diff) | |
parent | 514b69b2a6262832165612f092944199ecf71b35 (diff) | |
download | libexif-android12-mainline-tzdata-release.tar.gz |
Snap for 6983956 from 514b69b2a6262832165612f092944199ecf71b35 to qt-aml-tzdata-releaseq_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android12-mainline-tzdata-release
Change-Id: Iaba6705bc9bc685c476b303f99ad9b69885ae918
-rw-r--r-- | libexif/pentax/mnote-pentax-entry.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c index 7e97c2c..dcb1560 100644 --- a/libexif/pentax/mnote-pentax-entry.c +++ b/libexif/pentax/mnote-pentax-entry.c @@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, case EXIF_FORMAT_SHORT: { const unsigned char *data = entry->data; - size_t k, len = strlen(val); + size_t k, len = strlen(val), sizeleft; + + sizeleft = entry->size; for(k=0; k<entry->components; k++) { + if (sizeleft < 2) + break; vs = exif_get_short (data, entry->order); snprintf (val+len, maxlen-len, "%i ", vs); len = strlen(val); data += 2; + sizeleft -= 2; } } break; case EXIF_FORMAT_LONG: { const unsigned char *data = entry->data; - size_t k, len = strlen(val); + size_t k, len = strlen(val), sizeleft; + + sizeleft = entry->size; for(k=0; k<entry->components; k++) { + if (sizeleft < 4) + break; vl = exif_get_long (data, entry->order); snprintf (val+len, maxlen-len, "%li", (long int) vl); len = strlen(val); data += 4; + sizeleft -= 4; } } break; @@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, break; } - return (val); + return val; } |