third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp - Issue 1607733004: Fix crash when using disallowed URLs in image sets for content CSS property

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/core/css/CSSCursorImageValue.cpp

Issue 1607733004: Fix crash when using disallowed URLs in image sets for content CSS property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/LayoutTests/fast/css/content-image-set-disallowed-url-crash.html ('k') | third_party/WebKit/Source/core/css/CSSImageSetValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp

diff --git a/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp b/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp

index 3bc875dc0b0f38ff4a5ebe15a87f511c6ff38644..7ed12e907494ac9ee106d982e3068b428fde8dbb 100644

--- a/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp

+++ b/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp

@@ -128,14 +128,14 @@ StyleImage* CSSCursorImageValue::cachedImage(float deviceScaleFactor) const

ASSERT(!isCachePending(deviceScaleFactor));

if (m_imageValue->isImageSetValue())

- return toCSSImageSetValue(*m_imageValue).cachedImageSet(deviceScaleFactor);

+ return toCSSImageSetValue(*m_imageValue).cachedImage(deviceScaleFactor);

return m_cachedImage.get();

}

StyleImage* CSSCursorImageValue::cacheImage(Document* document, float deviceScaleFactor)

{

if (m_imageValue->isImageSetValue())

- return toCSSImageSetValue(*m_imageValue).cacheImageSet(document, deviceScaleFactor);

+ return toCSSImageSetValue(*m_imageValue).cacheImage(document, deviceScaleFactor);

if (m_isCachePending) {

m_isCachePending = false;