<!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>[178194] 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/178194">178194</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-09 13:57:05 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix error handling of ContentExtensionsManager when the top level input is unusable
https://bugs.webkit.org/show_bug.cgi?id=140284
Reviewed by Andreas Kling.
There are a couple of ways the WebProcess would crash if the input
is really really bad:
-If the JSON is unreadable, we can have an exception or decodedRules can be null.
-On any of the error, we cannot return immediately or we will skip vm.clear().
This patch adds a branch to fix the first issue.
For the second issue, a new function, loadEncodedRules(), encapsulate all the early
returns to make sure we execute the end of loadExtension().
* contentextensions/ContentExtensionsManager.cpp:
(WebCore::ContentExtensions::ExtensionsManager::loadEncodedRules):
(WebCore::ContentExtensions::ExtensionsManager::loadExtension):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsManagercpp">trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178193 => 178194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-09 21:25:08 UTC (rev 178193)
+++ trunk/Source/WebCore/ChangeLog 2015-01-09 21:57:05 UTC (rev 178194)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-09 Benjamin Poulain <benjamin@webkit.org>
+
+ Fix error handling of ContentExtensionsManager when the top level input is unusable
+ https://bugs.webkit.org/show_bug.cgi?id=140284
+
+ Reviewed by Andreas Kling.
+
+ There are a couple of ways the WebProcess would crash if the input
+ is really really bad:
+ -If the JSON is unreadable, we can have an exception or decodedRules can be null.
+ -On any of the error, we cannot return immediately or we will skip vm.clear().
+
+ This patch adds a branch to fix the first issue.
+
+ For the second issue, a new function, loadEncodedRules(), encapsulate all the early
+ returns to make sure we execute the end of loadExtension().
+
+ * contentextensions/ContentExtensionsManager.cpp:
+ (WebCore::ContentExtensions::ExtensionsManager::loadEncodedRules):
+ (WebCore::ContentExtensions::ExtensionsManager::loadExtension):
+
</ins><span class="cx"> 2015-01-09 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> Simplify LineWidth::wrapNextToShapeOutside()
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp (178193 => 178194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp 2015-01-09 21:25:08 UTC (rev 178193)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp 2015-01-09 21:57:05 UTC (rev 178194)
</span><span class="lines">@@ -108,48 +108,60 @@
</span><span class="cx"> ruleList.append(ContentExtensionRule(trigger, action));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void loadExtension(const String& identifier, const String& rules)
</del><ins>+static Vector<ContentExtensionRule> loadEncodedRules(ExecState& exec, const String& rules)
</ins><span class="cx"> {
</span><del>- Vector<ContentExtensionRule> ruleList;
</del><ins>+ JSValue decodedRules = JSONParse(&exec, rules);
</ins><span class="cx">
</span><del>- RefPtr<VM> vm = VM::create();
</del><ins>+ if (exec.hadException() || !decodedRules) {
+ WTFLogAlways("Failed to parse the JSON string.");
+ return Vector<ContentExtensionRule>();
+ }
</ins><span class="cx">
</span><del>- JSLockHolder locker(vm.get());
- JSGlobalObject* globalObject = JSGlobalObject::create(*vm, JSGlobalObject::createStructure(*vm, jsNull()));
-
- ExecState* exec = globalObject->globalExec();
- JSValue decodedRules = JSONParse(exec, rules);
</del><span class="cx"> if (decodedRules.isObject()) {
</span><del>- JSObject* topLevelObject = decodedRules.toObject(exec);
- if (!topLevelObject || exec->hadException()) {
</del><ins>+ JSObject* topLevelObject = decodedRules.toObject(&exec);
+ if (!topLevelObject || exec.hadException()) {
</ins><span class="cx"> WTFLogAlways("Invalid input, the top level structure is not an object.");
</span><del>- return;
</del><ins>+ return Vector<ContentExtensionRule>();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!isJSArray(topLevelObject)) {
</span><span class="cx"> WTFLogAlways("Invalid input, the top level object is not an array.");
</span><del>- return;
</del><ins>+ return Vector<ContentExtensionRule>();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ Vector<ContentExtensionRule> ruleList;
</ins><span class="cx"> JSArray* topLevelArray = jsCast<JSArray*>(topLevelObject);
</span><span class="cx">
</span><span class="cx"> unsigned length = topLevelArray->length();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><del>- JSValue value = topLevelArray->getIndex(exec, i);
- if (exec->hadException() || !value) {
</del><ins>+ JSValue value = topLevelArray->getIndex(&exec, i);
+ if (exec.hadException() || !value) {
</ins><span class="cx"> WTFLogAlways("Invalid object in the array.");
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JSObject* ruleObject = value.toObject(exec);
- if (!ruleObject || exec->hadException()) {
</del><ins>+ JSObject* ruleObject = value.toObject(&exec);
+ if (!ruleObject || exec.hadException()) {
</ins><span class="cx"> WTFLogAlways("Invalid rule");
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- loadRule(*exec, *ruleObject, ruleList);
</del><ins>+ loadRule(exec, *ruleObject, ruleList);
</ins><span class="cx"> }
</span><ins>+ return ruleList;
</ins><span class="cx"> }
</span><ins>+ return Vector<ContentExtensionRule>();
+}
</ins><span class="cx">
</span><ins>+void loadExtension(const String& identifier, const String& rules)
+{
+ RefPtr<VM> vm = VM::create();
+
+ JSLockHolder locker(vm.get());
+ JSGlobalObject* globalObject = JSGlobalObject::create(*vm, JSGlobalObject::createStructure(*vm, jsNull()));
+
+ ExecState* exec = globalObject->globalExec();
+ Vector<ContentExtensionRule> ruleList = loadEncodedRules(*exec, rules);
+
</ins><span class="cx"> vm.clear();
</span><span class="cx">
</span><span class="cx"> if (ruleList.isEmpty()) {
</span></span></pre>
</div>
</div>
</body>
</html>