Fixes: #1716196

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index ad487f0..d7101c5 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -179,7 +179,9 @@ exif_data_load_data_entry (ExifData *data, ExifEntry *entry,
        else
                doff = offset + 8;
 
-       /* Sanity check */
+       /* Sanity checks */
+       if ((doff + s < doff) || (doff + s < s))
+               return 0;
        if (size < doff + s)
                return 0;