chrome/utility/chrome_content_utility_client.cc - Issue 446853002: Fix invalid array access in OnRobustJPEGDecodeImage().

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: chrome/utility/chrome_content_utility_client.cc

Issue 446853002: Fix invalid array access in OnRobustJPEGDecodeImage(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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: chrome/utility/chrome_content_utility_client.cc

diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc

index 4f7b8fe1c3d810304b1111add6c9066267f35518..62251438092adfbfe64f579d5da68358cb139b88 100644

--- a/chrome/utility/chrome_content_utility_client.cc

+++ b/chrome/utility/chrome_content_utility_client.cc

@@ -232,7 +232,8 @@ void ChromeContentUtilityClient::OnCreateZipFile(

void ChromeContentUtilityClient::OnRobustJPEGDecodeImage(

const std::vector<unsigned char>& encoded_data) {

// Our robust jpeg decoding is using IJG libjpeg.

- if (gfx::JPEGCodec::JpegLibraryVariant() == gfx::JPEGCodec::IJG_LIBJPEG) {

+ if (gfx::JPEGCodec::JpegLibraryVariant() == gfx::JPEGCodec::IJG_LIBJPEG &&

+ !encoded_data.empty()) {

scoped_ptr<SkBitmap> decoded_image(gfx::JPEGCodec::Decode(

&encoded_data[0], encoded_data.size()));

if (!decoded_image.get() || decoded_image->empty()) {

« no previous file with comments | « no previous file | no next file » | no next file with comments »