<!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>[160664] trunk</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/160664">160664</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-16 14:51:00 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix crash when trying to load a null HTML string
https://bugs.webkit.org/show_bug.cgi?id=125801
Reviewed by Dan Bernstein.
Source/WebKit2:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::loadString):
Check that the string is not null before calling is8Bit(). Also, Use the latin1 encoding for
8-bit strings, since Latin 1 strings are not necessarily valid UTF-8 strings.
Tools:
* TestWebKitAPI/Tests/WebKit2/WillLoad.cpp:
(TestWebKitAPI::TEST_F):
Update test results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WillLoadcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160663 => 160664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-16 22:41:56 UTC (rev 160663)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-16 22:51:00 UTC (rev 160664)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-16 Anders Carlsson <andersca@apple.com>
+
+ Fix crash when trying to load a null HTML string
+ https://bugs.webkit.org/show_bug.cgi?id=125801
+
+ Reviewed by Dan Bernstein.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::loadString):
+ Check that the string is not null before calling is8Bit(). Also, Use the latin1 encoding for
+ 8-bit strings, since Latin 1 strings are not necessarily valid UTF-8 strings.
+
</ins><span class="cx"> 2013-12-16 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Expose whether the page contains only secure content
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (160663 => 160664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-16 22:41:56 UTC (rev 160663)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-16 22:51:00 UTC (rev 160664)
</span><span class="lines">@@ -919,9 +919,9 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::loadString(const String& htmlString, const String& MIMEType, const URL& baseURL, const URL& unreachableURL, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><del>- if (htmlString.is8Bit()) {
</del><ins>+ if (!htmlString.isNull() && htmlString.is8Bit()) {
</ins><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters8()), htmlString.length() * sizeof(LChar));
</span><del>- loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("utf-8"), baseURL, unreachableURL, decoder);
</del><ins>+ loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("latin1"), baseURL, unreachableURL, decoder);
</ins><span class="cx"> } else {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters16()), htmlString.length() * sizeof(UChar));
</span><span class="cx"> loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("utf-16"), baseURL, unreachableURL, decoder);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160663 => 160664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-16 22:41:56 UTC (rev 160663)
+++ trunk/Tools/ChangeLog 2013-12-16 22:51:00 UTC (rev 160664)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-16 Anders Carlsson <andersca@apple.com>
+
+ Fix crash when trying to load a null HTML string
+ https://bugs.webkit.org/show_bug.cgi?id=125801
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WebKit2/WillLoad.cpp:
+ (TestWebKitAPI::TEST_F):
+ Update test results.
+
</ins><span class="cx"> 2013-12-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fixed Win64 build on VS2013.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WillLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp (160663 => 160664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp 2013-12-16 22:41:56 UTC (rev 160663)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp 2013-12-16 22:51:00 UTC (rev 160664)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> WKPageLoadHTMLStringWithUserData(webView->page(), htmlString.get(), baseURL.get(), userData.get());
</span><span class="cx">
</span><del>- testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-8").get(), 0, userData.get());
</del><ins>+ testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("latin1").get(), 0, userData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(WebKit2WillLoadTest, WKPageLoadHTMLString)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> WKPageLoadHTMLString(webView->page(), htmlString.get(), baseURL.get());
</span><span class="cx">
</span><del>- testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-8").get(), 0, 0);
</del><ins>+ testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("latin1").get(), 0, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(WebKit2WillLoadTest, WKPageLoadAlternateHTMLStringWithUserData)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> WKPageLoadAlternateHTMLStringWithUserData(webView->page(), htmlString.get(), baseURL.get(), unreachableURL.get(), userData.get());
</span><span class="cx">
</span><del>- testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-8").get(), unreachableURL.get(), userData.get());
</del><ins>+ testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("latin1").get(), unreachableURL.get(), userData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(WebKit2WillLoadTest, WKPageLoadAlternateHTMLString)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx">
</span><span class="cx"> WKPageLoadAlternateHTMLString(webView->page(), htmlString.get(), baseURL.get(), unreachableURL.get());
</span><span class="cx">
</span><del>- testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-8").get(), unreachableURL.get(), 0);
</del><ins>+ testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("latin1").get(), unreachableURL.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(WebKit2WillLoadTest, WKPageLoadPlainTextStringWithUserData)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> WKPageLoadPlainTextStringWithUserData(webView->page(), plaintTextString.get(), userData.get());
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> blankURL = adoptWK(WKURLCreateWithUTF8CString("about:blank"));
</span><del>- testWillLoadDataRequestReturnValues(blankURL.get(), Util::toWK("text/plain").get(), Util::toWK("utf-8").get(), 0, userData.get());
</del><ins>+ testWillLoadDataRequestReturnValues(blankURL.get(), Util::toWK("text/plain").get(), Util::toWK("latin1").get(), 0, userData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(WebKit2WillLoadTest, WKPageLoadPlainTextString)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> WKPageLoadPlainTextString(webView->page(), plaintTextString.get());
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> blankURL = adoptWK(WKURLCreateWithUTF8CString("about:blank"));
</span><del>- testWillLoadDataRequestReturnValues(blankURL.get(), Util::toWK("text/plain").get(), Util::toWK("utf-8").get(), 0, 0);
</del><ins>+ testWillLoadDataRequestReturnValues(blankURL.get(), Util::toWK("text/plain").get(), Util::toWK("latin1").get(), 0, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>