diff options
| author | Sungsoo Lim <sungsoo@google.com> | 2016-07-20 17:04:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-20 17:04:35 +0000 |
| commit | f3d69fbae84fb019677871b8c7e4258270d3ff0c (patch) | |
| tree | 7d5ebb66089de9bba339e8d830cf8a63cce766f8 | |
| parent | e3574d919b171dd0c5a3710bd90350abaa609c6c (diff) | |
| parent | d3d573ee65ef3f3b3f9da3b6d7028699a1df5447 (diff) | |
| download | jhead-f3d69fbae84fb019677871b8c7e4258270d3ff0c.tar.gz | |
Fix possible out of bounds accesses am: ee54e6ceb6 am: 4c7c4297b5 am: 364ccf5071 am: fb76bf3245 am: 1a484d2270 am: d98576d450 am: de4cdf8758
am: d3d573ee65
Change-Id: I0e01c293c9b94130beef8de6ab38185515c21534
| -rw-r--r-- | gpsinfo.c | 2 | ||||
| -rw-r--r-- | makernote.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -174,7 +174,7 @@ void ProcessGpsInfo(unsigned char * DirStart, int ByteCountUnused, unsigned char 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; diff --git a/makernote.c b/makernote.c index cf40c6b..514518d 100644 --- a/makernote.c +++ b/makernote.c @@ -62,7 +62,7 @@ void ProcessCanonMakerNoteDir(unsigned char * DirStart, unsigned char * OffsetBa 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; |