Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp - Issue 11361023: Merge 132961 (merge bug: http://crbug.com/158840) - Fix potential overflow in jpeg exif reader. Fou…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

Issue 11361023: Merge 132961 (merge bug: http://crbug.com/158840) - Fix potential overflow in jpeg exif reader. Fou… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/

Patch Set: Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

===================================================================

--- Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 133084)

+++ Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (working copy)

@@ -187,7 +187,10 @@

unsigned ifdOffset;

if (!checkExifHeader(marker, isBigEndian, ifdOffset))

continue;

- ifdOffset += 6; // Account for 'Exif\0<fill byte>' header.

+ const unsigned offsetToTiffData = 6; // Account for 'Exif\0<fill byte>' header.

+ if (marker->data_length < offsetToTiffData || ifdOffset >= marker->data_length - offsetToTiffData)

+ continue;

+ ifdOffset += offsetToTiffData;

// The jpeg exif container format contains a tiff block for metadata.

// A tiff image file directory (ifd) consists of a uint16_t describing

« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »