diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-03-20 15:50:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-20 15:50:58 +0000 |
| commit | 0bc841a123bd00396866e518ea1b9927641a838e (patch) | |
| tree | 3dd6c4957edda78bc83e4aa8effb4ec6eaba9234 | |
| parent | 85f9ae037d8b50c268c554ee0b833ab86250c30a (diff) | |
| parent | dfc9321319386d320ae5d6082b40435da2956610 (diff) | |
| download | libexif-0bc841a123bd00396866e518ea1b9927641a838e.tar.gz | |
Merge "libexif: Avoid accessing invalid data" into qt-qpr1-dev am: ce72e0b7d4 am: dfc9321319
Change-Id: Ieec816a882ba9ed39f716e4cd3f8cf7081cb3e92
| -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)) |