diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-21 02:17:41 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-21 02:17:41 +0000 |
| commit | 6d565ca140a62691e336a1b48bc6f1235634fbd8 (patch) | |
| tree | 3dd6c4957edda78bc83e4aa8effb4ec6eaba9234 | |
| parent | 9e03b1af7106abbf90026405272b18c984afa907 (diff) | |
| parent | 064e3517fbe68e5329ce5ecd3ae8374b397bf234 (diff) | |
| download | libexif-android11-s1-release.tar.gz | |
Snap for 6318458 from 064e3517fbe68e5329ce5ecd3ae8374b397bf234 to rvc-releaseandroid-vts-11.0_r1android-security-11.0.0_r1android-r-preview-4android-r-beta-3android-r-beta-2android-cts-11.0_r2android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r1r-beta-2android11-s1-release
Change-Id: If0f8d2a75e86c99f52e6ce29e102af57db0ddd0e
| -rw-r--r-- | libexif/exif-entry.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c index 0f72865..4a90842 100644 --- a/libexif/exif-entry.c +++ b/libexif/exif-entry.c @@ -1043,12 +1043,12 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen) d = 0.; entry = exif_content_get_entry ( e->parent->parent->ifd[EXIF_IFD_0], EXIF_TAG_MAKE); - if (entry && entry->data && + if (entry && entry->data && (entry->size > 7) && !strncmp ((char *)entry->data, "Minolta", 7)) { entry = exif_content_get_entry ( e->parent->parent->ifd[EXIF_IFD_0], EXIF_TAG_MODEL); - if (entry && entry->data) { + if (entry && entry->data && (entry->size > 8)) { if (!strncmp ((char *)entry->data, "DiMAGE 7", 8)) d = 3.9; else if (!strncmp ((char *)entry->data, "DiMAGE 5", 8)) |