third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp - Issue 2528243002: Fix silent truncations when extracting values from CheckedNumeric

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: third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

Issue 2528243002: Fix silent truncations when extracting values from CheckedNumeric (Closed)

Patch Set: compile cleanup and fix Created 4 years, 1 month 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

« components/webcrypto/algorithms/aes_cbc.cc ('K') | « third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp ('k') | third_party/crashpad/crashpad/util/file/string_file.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

index a13f26e72adea0c470ea0d7b7593747073c54a26..9e0c32178edd900d7a7ea720bb4f424d2f8fc76f 100644

--- a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

+++ b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

@@ -2660,7 +2660,7 @@ GLenum WebGLImageConversion::computeImageSizeInBytes(

}

unsigned padding = 0;

- unsigned residual = checkedValue.ValueOrDie() % params.alignment;

+ unsigned residual = (checkedValue % params.alignment).ValueOrDie();

if (residual) {

padding = params.alignment - residual;

checkedValue += padding;

@@ -2675,7 +2675,7 @@ GLenum WebGLImageConversion::computeImageSizeInBytes(

rows += height;

if (!rows.IsValid())

return GL_INVALID_VALUE;

- checkedValue *= (rows.ValueOrDie() - 1);

+ checkedValue *= (rows - 1);

// Last row is not affected by ROW_LENGTH parameter.

checkedValue += lastRowSize;

if (!checkedValue.IsValid())