diff options
author | Marco Nelissen <marcone@google.com> | 2016-06-10 21:46:08 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 21:46:08 +0000 |
commit | 2ea3783c815f703030583f31a6b8292713a12f72 (patch) | |
tree | e6c1fac71143a5b0cde5934c99649cf6d3528b8d | |
parent | 5c8f937269957e6651383e988006824781fd021a (diff) | |
parent | 854fedfa6b1cae1f37fe407f407ba833954b8fba (diff) | |
download | jhead-2ea3783c815f703030583f31a6b8292713a12f72.tar.gz |
Fix possible out of bounds access am: 751b4eba25 am: b201f04d8c am: 2d49e2de6e am: a3c15ad42d am: 6c2d0e45b5 am: dbefc1dc4a
am: 854fedfa6b
Change-Id: Ifa6542f461e2114876bb887125f47c4f3594e41e
-rw-r--r-- | exif.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -614,7 +614,7 @@ static void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned OffsetVal; OffsetVal = Get32u(DirEntry+8); // If its bigger than 4 bytes, the dir entry contains an offset. - if (OffsetVal+ByteCount > ExifLength){ + if (OffsetVal > UINT32_MAX - ByteCount || OffsetVal+ByteCount > ExifLength){ // Bogus pointer offset and / or bytecount value ErrNonfatal("Illegal value pointer for tag %04x", Tag,0); continue; |