diff options
author | Marco Nelissen <marcone@google.com> | 2016-06-10 22:05:01 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 22:05:01 +0000 |
commit | 9c6e507bb38e1cede54c392058fd6ba42f0ef0a7 (patch) | |
tree | 0ae81ff5f3a5e4ec86a86a72694409520823640d | |
parent | fa25efff717631d9728d482e4d4a504ab07f39b6 (diff) | |
parent | a0628a05191a81f88f83077f0c1616aa91f5c0f8 (diff) | |
download | jhead-master.tar.gz |
Fix possible out of bounds access am: 751b4eba25 am: b201f04d8c am: 2d49e2de6e am: a3c15ad42d am: 6c2d0e45b5 am: dbefc1dc4a am: 854fedfa6b am: 2ea3783c81 am: e3574d919b am: 3daffc0fba am: 2a4c12f5e5HEADandroid-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4nougat-iot-releasen-iot-preview-4mastermain
am: a0628a0519
Change-Id: Ib5d873506e2d728ce6b86eea402dca5b856deed3
-rw-r--r-- | exif.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -658,7 +658,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; |