Source/WebCore/css/CSSImportRule.cpp - Issue 10143006: Merge 114350 - Stack overflow in CSS parser caused by recursive stylesheet import

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

Issue 10143006: Merge 114350 - Stack overflow in CSS parser caused by recursive stylesheet import (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/

Patch Set: Created 8 years, 8 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/css/CSSImportRule.cpp

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

--- Source/WebCore/css/CSSImportRule.cpp (revision 114709)

+++ Source/WebCore/css/CSSImportRule.cpp (working copy)

@@ -140,7 +140,7 @@

CSSStyleSheet* rootSheet = parentSheet;

for (CSSStyleSheet* sheet = parentSheet; sheet; sheet = sheet->parentStyleSheet()) {

// FIXME: This is wrong if the finalURL was updated via document::updateBaseURL.

- if (absHref == sheet->finalURL().string())

+ if (absHref == sheet->finalURL().string() || absHref == sheet->href())

return;

rootSheet = sheet;

}

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