diff options
author | Sungsoo Lim <sungsoo@google.com> | 2016-07-20 16:54:06 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-20 16:54:06 +0000 |
commit | 1a484d22706fc6fc399b86675be4267106c00dae (patch) | |
tree | e978abacd264d7d6a1a0d087427b7f82528722a4 | |
parent | 6c2d0e45b56eda4d73e8b9f6ac901753f1b68bf9 (diff) | |
parent | fb76bf32454ad32290f8d6613c6ef3ddb6368a1d (diff) | |
download | jhead-1a484d22706fc6fc399b86675be4267106c00dae.tar.gz |
Fix possible out of bounds accesses am: ee54e6ceb6 am: 4c7c4297b5 am: 364ccf5071
am: fb76bf3245
Change-Id: I1db9913eef6024b9c9fe57b5bb1149ec62ddde07
-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; |