diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-11-18 18:35:28 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-11-18 18:35:28 +0000 |
| commit | 72b95b1ba1c808694da8da6d8730fb68117272f7 (patch) | |
| tree | 2dc0c8fc86a4d7a276d17b56b752355d1b7f9d2b | |
| parent | 1a06ac410c2a70f1b0e2a6698f642ca1064a9213 (diff) | |
| parent | 9ec8c86860a4e5739f9f31ba38f5976abadd0546 (diff) | |
| download | libexif-android11-mainline-sparse-2021-jan-release.tar.gz | |
Snap for 6981242 from 9ec8c86860a4e5739f9f31ba38f5976abadd0546 to mainline-releaser_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r4android-mainline-11.0.0_r33android-mainline-11.0.0_r19android-mainline-11.0.0_r10android11-mainline-sparse-2021-jan-releaseandroid11-mainline-release
Change-Id: Ie9f388a17594500e4010b8cee5fcc3ce85914a4e
| -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; } |