Snap for 6318458 from 064e3517fbe68e5329ce5ecd3ae8374b397bf234 to rvc-release
Change-Id: If0f8d2a75e86c99f52e6ce29e102af57db0ddd0e
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 @@
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))
