<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193449] branches/safari-601.1.46-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193449">193449</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 12:53:15 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188222">r188222</a>. rdar://problem/23581597</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorInspectorStyleSheetcpp">branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193448 => 193449)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-04 20:53:11 UTC (rev 193448)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-04 20:53:15 UTC (rev 193449)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-12-04 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188222. rdar://problem/23581597
+
+ 2015-08-10 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Invalid selectors can be applied to the stylesheet
+ https://bugs.webkit.org/show_bug.cgi?id=147230
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::isValidSelectorListString):
+ (WebCore::InspectorStyleSheet::setRuleSelector):
+ Now checks to see that the supplied selector is valid before trying to commit it to the rule.
+ (WebCore::InspectorStyleSheet::addRule):
+ (WebCore::checkStyleRuleSelector): Deleted.
+
+2015-12-04 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r186891. rdar://problem/23581597
</span><span class="cx">
</span><span class="cx"> 2015-07-16 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp (193448 => 193449)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2015-12-04 20:53:11 UTC (rev 193448)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2015-12-04 20:53:15 UTC (rev 193449)
</span><span class="lines">@@ -637,15 +637,30 @@
</span><span class="cx"> return rule->selectorText();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isValidSelectorListString(const String& selector, Document* document)
+{
+ CSSSelectorList selectorList;
+ createCSSParser(document)->parseSelector(selector, selectorList);
+ return selectorList.isValid();
+}
+
</ins><span class="cx"> bool InspectorStyleSheet::setRuleSelector(const InspectorCSSId& id, const String& selector, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (!checkPageStyleSheet(ec))
</span><span class="cx"> return false;
</span><ins>+
+ // If the selector is invalid, do not proceed any further.
+ if (!isValidSelectorListString(selector, m_pageStyleSheet->ownerDocument())) {
+ ec = SYNTAX_ERR;
+ return false;
+ }
+
</ins><span class="cx"> CSSStyleRule* rule = ruleForId(id);
</span><span class="cx"> if (!rule) {
</span><span class="cx"> ec = NOT_FOUND_ERR;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> CSSStyleSheet* styleSheet = rule->parentStyleSheet();
</span><span class="cx"> if (!styleSheet || !ensureParsedDataReady()) {
</span><span class="cx"> ec = NOT_FOUND_ERR;
</span><span class="lines">@@ -671,18 +686,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool checkStyleRuleSelector(Document* document, const String& selector)
-{
- CSSSelectorList selectorList;
- createCSSParser(document)->parseSelector(selector, selectorList);
- return selectorList.isValid();
-}
-
</del><span class="cx"> CSSStyleRule* InspectorStyleSheet::addRule(const String& selector, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (!checkPageStyleSheet(ec))
</span><span class="cx"> return nullptr;
</span><del>- if (!checkStyleRuleSelector(m_pageStyleSheet->ownerDocument(), selector)) {
</del><ins>+ if (!isValidSelectorListString(selector, m_pageStyleSheet->ownerDocument())) {
</ins><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>