third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp - Issue 2458003002: Remove ASSERT_WITH_SECURITY_IMPLICATION.

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/image-decoders/ico/ICOImageDecoder.cpp

Issue 2458003002: Remove ASSERT_WITH_SECURITY_IMPLICATION. (Closed)

Patch Set: Minor formatting fix Created 4 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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/paint/DisplayItem.h ('k') | third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

diff --git a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

index 2cb6eab842728f80179b5f961618b6ded839053e..10ccb5d41d21128766e0e79a222a79d358d1ad17 100644

--- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

+++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

@@ -189,7 +189,7 @@ bool ICOImageDecoder::decodeDirectory() {

}

bool ICOImageDecoder::decodeAtIndex(size_t index) {

- ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size());

+ SECURITY_DCHECK(index < m_dirEntries.size());

const IconDirectoryEntry& dirEntry = m_dirEntries[index];

const ImageType imageType = imageTypeAtIndex(index);

if (imageType == Unknown)

@@ -330,7 +330,7 @@ ICOImageDecoder::IconDirectoryEntry ICOImageDecoder::readDirectoryEntry() {

ICOImageDecoder::ImageType ICOImageDecoder::imageTypeAtIndex(size_t index) {

// Check if this entry is a BMP or a PNG; we need 4 bytes to check the magic

// number.

- ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size());

+ SECURITY_DCHECK(index < m_dirEntries.size());

const uint32_t imageOffset = m_dirEntries[index].m_imageOffset;

if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4))

return Unknown;