<!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>[184413] trunk/Source</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/184413">184413</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-05-15 13:48:21 -0700 (Fri, 15 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Content Extensions] Fail to load old content extension files
https://bugs.webkit.org/show_bug.cgi?id=145027
Reviewed by Eric Carlson.
Source/WebCore:
* contentextensions/DFABytecode.h:
Source/WebKit2:
* UIProcess/API/APIUserContentExtensionStore.cpp:
(API::openAndMapContentExtension):
* UIProcess/API/APIUserContentExtensionStore.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsDFABytecodeh">trunk/Source/WebCore/contentextensions/DFABytecode.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStorecpp">trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStoreh">trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184412 => 184413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-15 20:47:16 UTC (rev 184412)
+++ trunk/Source/WebCore/ChangeLog 2015-05-15 20:48:21 UTC (rev 184413)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-05-15 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Fail to load old content extension files
+ https://bugs.webkit.org/show_bug.cgi?id=145027
+
+ Reviewed by Eric Carlson.
+
+ * contentextensions/DFABytecode.h:
+
</ins><span class="cx"> 2015-05-15 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFABytecodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFABytecode.h (184412 => 184413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFABytecode.h 2015-05-15 20:47:16 UTC (rev 184412)
+++ trunk/Source/WebCore/contentextensions/DFABytecode.h 2015-05-15 20:48:21 UTC (rev 184413)
</span><span class="lines">@@ -34,6 +34,9 @@
</span><span class="cx">
</span><span class="cx"> typedef uint8_t DFABytecode;
</span><span class="cx">
</span><ins>+// Increment UserContentExtensionStore::CurrentContentExtensionFileVersion
+// when making any non-backwards-compatible changes to the bytecode.
+// FIXME: Changes here should not require changes in WebKit2. Move all versioning to WebCore.
</ins><span class="cx"> enum class DFABytecodeInstruction : uint8_t {
</span><span class="cx">
</span><span class="cx"> // CheckValue has two arguments:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184412 => 184413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-15 20:47:16 UTC (rev 184412)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-15 20:48:21 UTC (rev 184413)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-15 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Fail to load old content extension files
+ https://bugs.webkit.org/show_bug.cgi?id=145027
+
+ Reviewed by Eric Carlson.
+
+ * UIProcess/API/APIUserContentExtensionStore.cpp:
+ (API::openAndMapContentExtension):
+ * UIProcess/API/APIUserContentExtensionStore.h:
+
</ins><span class="cx"> 2015-05-15 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Limit alternate fullscreen with linked on or after.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp (184412 => 184413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-15 20:47:16 UTC (rev 184412)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-15 20:48:21 UTC (rev 184413)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> const size_t ContentExtensionFileHeaderSize = sizeof(uint32_t) + 4 * sizeof(uint64_t);
</span><span class="cx"> struct ContentExtensionMetaData {
</span><del>- uint32_t version { 2 };
</del><ins>+ uint32_t version { UserContentExtensionStore::CurrentContentExtensionFileVersion };
</ins><span class="cx"> uint64_t actionsSize { 0 };
</span><span class="cx"> uint64_t filtersWithoutDomainsBytecodeSize { 0 };
</span><span class="cx"> uint64_t filtersWithDomainBytecodeSize { 0 };
</span><span class="lines">@@ -325,6 +325,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (metaData.version != UserContentExtensionStore::CurrentContentExtensionFileVersion) {
+ RunLoop::main().dispatch([self, completionHandler] {
+ completionHandler(nullptr, Error::VersionMismatch);
+ });
+ return;
+ }
+
</ins><span class="cx"> RunLoop::main().dispatch([self, identifierCapture, fileData, metaData, completionHandler] {
</span><span class="cx"> RefPtr<API::UserContentExtension> userContentExtension = createExtension(identifierCapture.string(), metaData, fileData);
</span><span class="cx"> completionHandler(userContentExtension, { });
</span><span class="lines">@@ -400,6 +407,8 @@
</span><span class="cx"> switch (static_cast<UserContentExtensionStore::Error>(errorCode)) {
</span><span class="cx"> case UserContentExtensionStore::Error::LookupFailed:
</span><span class="cx"> return "Unspecified error during lookup.";
</span><ins>+ case UserContentExtensionStore::Error::VersionMismatch:
+ return "Version of file does not match version of interpreter.";
</ins><span class="cx"> case UserContentExtensionStore::Error::CompileFailed:
</span><span class="cx"> return "Unspecified error during compile.";
</span><span class="cx"> case UserContentExtensionStore::Error::RemoveFailed:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h (184412 => 184413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h 2015-05-15 20:47:16 UTC (rev 184412)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h 2015-05-15 20:48:21 UTC (rev 184413)
</span><span class="lines">@@ -44,9 +44,14 @@
</span><span class="cx"> public:
</span><span class="cx"> enum class Error {
</span><span class="cx"> LookupFailed = 1,
</span><ins>+ VersionMismatch,
</ins><span class="cx"> CompileFailed,
</span><span class="cx"> RemoveFailed
</span><span class="cx"> };
</span><ins>+
+ // This should be incremented every time a functional change is made to the bytecode, file format, etc.
+ // to prevent crashing while loading old data.
+ const static uint32_t CurrentContentExtensionFileVersion = 2;
</ins><span class="cx">
</span><span class="cx"> static UserContentExtensionStore& defaultStore();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>