<!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>[179258] trunk/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/179258">179258</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-01-28 09:50:00 -0800 (Wed, 28 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/173698">r173698</a>): Leaks of selector lists in CSS parsing
https://bugs.webkit.org/show_bug.cgi?id=140993
Reviewed by Anders Carlsson.
* css/CSSGrammar.y.in: Fixed logic in rules that were not moving a parser-
owned pointer into a unique_ptr in all code paths. The magic value
invalidSelectorVector makes this really messy. We might want to find a
different seolution in the future.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179257 => 179258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-28 17:49:45 UTC (rev 179257)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 17:50:00 UTC (rev 179258)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-28 Darin Adler <darin@apple.com>
+
+ REGRESSION (r173698): Leaks of selector lists in CSS parsing
+ https://bugs.webkit.org/show_bug.cgi?id=140993
+
+ Reviewed by Anders Carlsson.
+
+ * css/CSSGrammar.y.in: Fixed logic in rules that were not moving a parser-
+ owned pointer into a unique_ptr in all code paths. The magic value
+ invalidSelectorVector makes this really messy. We might want to find a
+ different seolution in the future.
+
</ins><span class="cx"> 2015-01-28 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix after r179247.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (179257 => 179258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2015-01-28 17:49:45 UTC (rev 179257)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2015-01-28 17:50:00 UTC (rev 179258)
</span><span class="lines">@@ -85,16 +85,13 @@
</span><span class="cx"> return v;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-auto invalidSelectorVector = reinterpret_cast<Vector<std::unique_ptr<CSSParserSelector>>*>(-1);
</del><ins>+static auto* const invalidSelectorVector = reinterpret_cast<Vector<std::unique_ptr<CSSParserSelector>>*>(-1);
</ins><span class="cx">
</span><span class="cx"> static bool selectorListDoesNotMatchAnyPseudoElement(const Vector<std::unique_ptr<CSSParserSelector>>* selectorVector)
</span><span class="cx"> {
</span><span class="cx"> if (!selectorVector)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (selectorVector == invalidSelectorVector)
- return false;
-
</del><span class="cx"> for (unsigned i = 0; i < selectorVector->size(); ++i) {
</span><span class="cx"> for (const CSSParserSelector* selector = selectorVector->at(i).get(); selector; selector = selector->tagHistory()) {
</span><span class="cx"> if (selector->matchesPseudoElement())
</span><span class="lines">@@ -317,7 +314,8 @@
</span><span class="cx">
</span><span class="cx"> %union { Vector<std::unique_ptr<CSSParserSelector>>* selectorList; }
</span><span class="cx"> %type <selectorList> selector_list nested_selector_list simple_selector_list nth_selector_ending
</span><del>-%destructor { delete $$; } selector_list nested_selector_list simple_selector_list nth_selector_ending
</del><ins>+%destructor { delete $$; } selector_list nested_selector_list simple_selector_list
+%destructor { if ($$ != invalidSelectorVector) delete $$; } nth_selector_ending
</ins><span class="cx">
</span><span class="cx"> %union { bool boolean; }
</span><span class="cx"> %type <boolean> declaration declaration_list decl_list priority
</span><span class="lines">@@ -1417,45 +1415,53 @@
</span><span class="cx"> // Definition of :nth-child().
</span><span class="cx"> | ':' NTHCHILDFUNCTIONS maybe_space NTH nth_selector_ending {
</span><span class="cx"> $$ = nullptr;
</span><del>- if (selectorListDoesNotMatchAnyPseudoElement($5)) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument($4);
- selector->setPseudoClassValue($2);
- if ($5)
- selector->adoptSelectorVector(*std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($5));
-
- CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
- if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
- $$ = selector.release();
</del><ins>+ if ($5 != invalidSelectorVector) {
+ std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($5);
+ if (selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
+ auto selector = std::make_unique<CSSParserSelector>();
+ selector->setMatch(CSSSelector::PseudoClass);
+ selector->setArgument($4);
+ selector->setPseudoClassValue($2);
+ if (ending)
+ selector->adoptSelectorVector(*ending);
+ CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
+ if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
+ $$ = selector.release();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> | ':' NTHCHILDFUNCTIONS maybe_space maybe_unary_operator INTEGER nth_selector_ending {
</span><span class="cx"> $$ = nullptr;
</span><del>- if (selectorListDoesNotMatchAnyPseudoElement($6)) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument(AtomicString::number($4 * $5));
- selector->setPseudoClassValue($2);
- if ($6)
- selector->adoptSelectorVector(*std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($6));
- CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
- if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
- $$ = selector.release();
</del><ins>+ if ($6 != invalidSelectorVector) {
+ std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($6);
+ if (selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
+ auto selector = std::make_unique<CSSParserSelector>();
+ selector->setMatch(CSSSelector::PseudoClass);
+ selector->setArgument(AtomicString::number($4 * $5));
+ selector->setPseudoClassValue($2);
+ if (ending)
+ selector->adoptSelectorVector(*ending);
+ CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
+ if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
+ $$ = selector.release();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> | ':' NTHCHILDFUNCTIONS maybe_space IDENT nth_selector_ending {
</span><span class="cx"> $$ = nullptr;
</span><del>- if (isValidNthToken($4) && selectorListDoesNotMatchAnyPseudoElement($5)) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument($4);
- selector->setPseudoClassValue($2);
- if ($5)
- selector->adoptSelectorVector(*std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($5));
- CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
- if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
- $$ = selector.release();
</del><ins>+ if ($5 != invalidSelectorVector) {
+ std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($5);
+ if (isValidNthToken($4) && selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
+ auto selector = std::make_unique<CSSParserSelector>();
+ selector->setMatch(CSSSelector::PseudoClass);
+ selector->setArgument($4);
+ selector->setPseudoClassValue($2);
+ if (ending)
+ selector->adoptSelectorVector(*ending);
+ CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
+ if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
+ $$ = selector.release();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1500,13 +1506,16 @@
</span><span class="cx"> // Definition of :not().
</span><span class="cx"> | ':' NOTFUNCTION maybe_space nested_selector_list maybe_space ')' {
</span><span class="cx"> $$ = nullptr;
</span><del>- if ($4 && selectorListDoesNotMatchAnyPseudoElement($4)) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setPseudoClassValue($2);
- selector->adoptSelectorVector(*std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($4));
- if (selector->pseudoClassType() == CSSSelector::PseudoClassNot)
- $$ = selector.release();
</del><ins>+ if ($4 != invalidSelectorVector) {
+ std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> list($4);
+ if (list && selectorListDoesNotMatchAnyPseudoElement(list.get())) {
+ auto selector = std::make_unique<CSSParserSelector>();
+ selector->setMatch(CSSSelector::PseudoClass);
+ selector->setPseudoClassValue($2);
+ selector->adoptSelectorVector(*list);
+ if (selector->pseudoClassType() == CSSSelector::PseudoClassNot)
+ $$ = selector.release();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> ;
</span></span></pre>
</div>
</div>
</body>
</html>