<!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>[176865] branches/safari-600.3-branch</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/176865">176865</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-12-05 13:10:39 -0800 (Fri, 05 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173566">r173566</a>. rdar://problems/19150984</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2SharedAPIccgWKImageCGcpp">branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp</a></li>
<li><a href="#branchessafari6003branchToolsChangeLog">branches/safari-600.3-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6003branchToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">branches/safari-600.3-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6003branchToolsTestWebKitAPITestsWebKit2WKImageCreateCGImageCrashcpp">branches/safari-600.3-branch/Tools/TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176864 => 176865)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-05 20:58:08 UTC (rev 176864)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-05 21:10:39 UTC (rev 176865)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-05 Dana Burkart <dburkart@apple.com>
+
+ Merge r173566. <rdar://problem/19150984>
+
+ 2014-09-11 Andy Estes <aestes@apple.com>
+
+ [WebKit2] WKImageCreateCGImage crashes when passed a null WKImage
+ https://bugs.webkit.org/show_bug.cgi?id=136768
+
+ Reviewed by Tim Horton.
+
+ WKImageCreateFromCGImage can return null, so it only seems fair that WKImageCreateCGImage should tolerate null.
+
+ * Shared/API/c/cg/WKImageCG.cpp:
+ (WKImageCreateCGImage):
+
+
</ins><span class="cx"> 2014-12-04 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176766. <rdar://problem/19072083>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2SharedAPIccgWKImageCGcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp (176864 => 176865)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2014-12-05 20:58:08 UTC (rev 176864)
+++ branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2014-12-05 21:10:39 UTC (rev 176865)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> CGImageRef WKImageCreateCGImage(WKImageRef imageRef)
</span><span class="cx"> {
</span><span class="cx"> WebImage* webImage = toImpl(imageRef);
</span><del>- if (!webImage->bitmap())
</del><ins>+ if (!webImage || !webImage->bitmap())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> return webImage->bitmap()->makeCGImageCopy().leakRef();
</span></span></pre></div>
<a id="branchessafari6003branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Tools/ChangeLog (176864 => 176865)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Tools/ChangeLog 2014-12-05 20:58:08 UTC (rev 176864)
+++ branches/safari-600.3-branch/Tools/ChangeLog 2014-12-05 21:10:39 UTC (rev 176865)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-12-05 Dana Burkart <dburkart@apple.com>
+
+ Merge r173566. <rdar://problem/19150984>
+
+ 2014-09-11 Andy Estes <aestes@apple.com>
+
+ [WebKit2] WKImageCreateCGImage crashes when passed a null WKImage
+ https://bugs.webkit.org/show_bug.cgi?id=136768
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp: Added.
+ (TestWebKitAPI::TEST):
+
+
</ins><span class="cx"> 2014-12-02 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176574. <rdar://problem/19052564>
</span></span></pre></div>
<a id="branchessafari6003branchToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (176864 => 176865)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2014-12-05 20:58:08 UTC (rev 176864)
+++ branches/safari-600.3-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2014-12-05 21:10:39 UTC (rev 176865)
</span><span class="lines">@@ -156,6 +156,7 @@
</span><span class="cx"> 9B4F8FA4159D52B1002D9F94 /* HTMLCollectionNamedItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9B4F8FA3159D52B1002D9F94 /* HTMLCollectionNamedItem.mm */; };
</span><span class="cx"> 9B4F8FA7159D52DD002D9F94 /* HTMLCollectionNamedItem.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 9B4F8FA6159D52CA002D9F94 /* HTMLCollectionNamedItem.html */; };
</span><span class="cx"> A1A4FE5F18DD3DB700B5EA8A /* Download.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1A4FE5D18DD3DB700B5EA8A /* Download.mm */; };
</span><ins>+ A1FDFD3019C288BB005148A4 /* WKImageCreateCGImageCrash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1FDFD2E19C288BB005148A4 /* WKImageCreateCGImageCrash.cpp */; };
</ins><span class="cx"> A57A34F016AF677200C2501F /* PageVisibilityStateWithWindowChanges.mm in Sources */ = {isa = PBXBuildFile; fileRef = A57A34EF16AF677200C2501F /* PageVisibilityStateWithWindowChanges.mm */; };
</span><span class="cx"> A57A34F216AF6B2B00C2501F /* PageVisibilityStateWithWindowChanges.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = A57A34F116AF69E200C2501F /* PageVisibilityStateWithWindowChanges.html */; };
</span><span class="cx"> A5E2027315B2181900C13E14 /* WindowlessWebViewWithMedia.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5E2027215B2181900C13E14 /* WindowlessWebViewWithMedia.mm */; };
</span><span class="lines">@@ -502,6 +503,7 @@
</span><span class="cx"> 9B4F8FA3159D52B1002D9F94 /* HTMLCollectionNamedItem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HTMLCollectionNamedItem.mm; sourceTree = "<group>"; };
</span><span class="cx"> 9B4F8FA6159D52CA002D9F94 /* HTMLCollectionNamedItem.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = HTMLCollectionNamedItem.html; sourceTree = "<group>"; };
</span><span class="cx"> A1A4FE5D18DD3DB700B5EA8A /* Download.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Download.mm; sourceTree = "<group>"; };
</span><ins>+ A1FDFD2E19C288BB005148A4 /* WKImageCreateCGImageCrash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKImageCreateCGImageCrash.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> A57A34EF16AF677200C2501F /* PageVisibilityStateWithWindowChanges.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageVisibilityStateWithWindowChanges.mm; sourceTree = "<group>"; };
</span><span class="cx"> A57A34F116AF69E200C2501F /* PageVisibilityStateWithWindowChanges.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = PageVisibilityStateWithWindowChanges.html; sourceTree = "<group>"; };
</span><span class="cx"> A5E2027015B2180600C13E14 /* WindowlessWebViewWithMedia.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = WindowlessWebViewWithMedia.html; sourceTree = "<group>"; };
</span><span class="lines">@@ -882,10 +884,11 @@
</span><span class="cx"> 7CFBCAE31743238E00B2BFCF /* WillLoad_Bundle.cpp */,
</span><span class="cx"> 76E182D91547550100F1FADD /* WillSendSubmitEvent.cpp */,
</span><span class="cx"> 76E182DC1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp */,
</span><ins>+ A1FDFD2E19C288BB005148A4 /* WKImageCreateCGImageCrash.cpp */,
+ BC9099931256ACF100083756 /* WKStringJSString.cpp */,
</ins><span class="cx"> 51E93016156B13E1004C99DF /* WKPageGetScaleFactorNotZero.cpp */,
</span><span class="cx"> BC7B619A1299FE9E00D174A4 /* WKPreferences.cpp */,
</span><span class="cx"> BC90995D12567BC100083756 /* WKString.cpp */,
</span><del>- BC9099931256ACF100083756 /* WKStringJSString.cpp */,
</del><span class="cx"> );
</span><span class="cx"> path = WebKit2;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -1286,6 +1289,7 @@
</span><span class="cx"> 1A7E8B34181208DE00AEB74A /* FragmentNavigation.mm in Sources */,
</span><span class="cx"> 517E7DFC15110EA600D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.mm in Sources */,
</span><span class="cx"> 0FC6C4CF141034AD005B7F0C /* MetaAllocator.cpp in Sources */,
</span><ins>+ A1FDFD3019C288BB005148A4 /* WKImageCreateCGImageCrash.cpp in Sources */,
</ins><span class="cx"> 33BE5AF5137B5A6C00705813 /* MouseMoveAfterCrash.cpp in Sources */,
</span><span class="cx"> 93F1DB3114DA20760024C362 /* NewFirstVisuallyNonEmptyLayout.cpp in Sources */,
</span><span class="cx"> 93F1DB5514DB1B730024C362 /* NewFirstVisuallyNonEmptyLayoutFails.cpp in Sources */,
</span></span></pre></div>
<a id="branchessafari6003branchToolsTestWebKitAPITestsWebKit2WKImageCreateCGImageCrashcppfromrev176859branchessafari6003branchSourceWebKit2SharedAPIccgWKImageCGcpp"></a>
<div class="copfile"><h4>Copied: branches/safari-600.3-branch/Tools/TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp (from rev 176859, branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp) (0 => 176865)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Tools/TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp (rev 0)
+++ branches/safari-600.3-branch/Tools/TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp 2014-12-05 21:10:39 UTC (rev 176865)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include <WebKit/WKImageCG.h>
+
+namespace TestWebKitAPI {
+
+TEST(WebKit2, WKImageCreateCGImageCrash)
+{
+ EXPECT_FALSE(WKImageCreateCGImage(nullptr));
+}
+
+} // namespace TestWebKitAPI
</ins></span></pre>
</div>
</div>
</body>
</html>