diff options
author | Sungsoo Lim <sungsoo@google.com> | 2016-07-20 10:37:20 +0900 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-07-21 17:29:08 -0700 |
commit | cbbecf71a7ef5e5b9f80fad1461c94be3d82a3e8 (patch) | |
tree | 7d5ebb66089de9bba339e8d830cf8a63cce766f8 | |
parent | bae671597d47b9e5955c4cb742e468cebfd7ca6b (diff) | |
download | jhead-cbbecf71a7ef5e5b9f80fad1461c94be3d82a3e8.tar.gz |
Fix possible out of bounds accessesandroid-6.0.1_r79android-6.0.1_r78android-6.0.1_r74android-6.0.1_r70android-6.0.1_r66
Bug: 30074856
Change-Id: I1a1387ed29d2e0d010b0d5d4bb3d29453a3a7666
-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; |