diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-13 23:48:39 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-13 23:48:39 +0000 |
commit | ccda692d740693854680adb77f3ac782c26949a3 (patch) | |
tree | 2dc0c8fc86a4d7a276d17b56b752355d1b7f9d2b | |
parent | d763bb8cbe0f82ddc49c43421b4aaf8bcc2dbcce (diff) | |
parent | 9ec8c86860a4e5739f9f31ba38f5976abadd0546 (diff) | |
download | libexif-android11-mainline-media-release.tar.gz |
Snap for 7080740 from 9ec8c86860a4e5739f9f31ba38f5976abadd0546 to mainline-media-releaseandroid-mainline-11.0.0_r39android-mainline-11.0.0_r32android-mainline-11.0.0_r16android11-mainline-media-release
Change-Id: Id9e66acb3fc3a83787f7ab698eee5b10fe2d526c
-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; } |