Diff
Modified: trunk/Source/WebKit/ChangeLog (238407 => 238408)
--- trunk/Source/WebKit/ChangeLog 2018-11-20 23:38:23 UTC (rev 238407)
+++ trunk/Source/WebKit/ChangeLog 2018-11-20 23:46:23 UTC (rev 238408)
@@ -1,3 +1,12 @@
+2018-11-20 Jeff Miller <je...@apple.com>
+
+ Return nullptr immediately if the key doesn't exist in the HashMap.
+ https://bugs.webkit.org/show_bug.cgi?id=191841
+
+ Reviewed by Chris Dumez.
+
+ * Shared/API/APIDictionary.h:
+
2018-11-20 Don Olmstead <don.olmst...@sony.com>
WebPasteboard should USE(LIBWPE)
Modified: trunk/Source/WebKit/Shared/API/APIDictionary.h (238407 => 238408)
--- trunk/Source/WebKit/Shared/API/APIDictionary.h 2018-11-20 23:38:23 UTC (rev 238407)
+++ trunk/Source/WebKit/Shared/API/APIDictionary.h 2018-11-20 23:46:23 UTC (rev 238408)
@@ -66,6 +66,9 @@
{
auto it = m_map.find(key);
exists = it != m_map.end();
+ if (!exists)
+ return nullptr;
+
return it->value.get();
}
Modified: trunk/Tools/ChangeLog (238407 => 238408)
--- trunk/Tools/ChangeLog 2018-11-20 23:38:23 UTC (rev 238407)
+++ trunk/Tools/ChangeLog 2018-11-20 23:46:23 UTC (rev 238408)
@@ -1,3 +1,16 @@
+2018-11-20 Jeff Miller <je...@apple.com>
+
+ Return nullptr immediately if the key doesn't exist in the HashMap.
+ https://bugs.webkit.org/show_bug.cgi?id=191841
+
+ Reviewed by Chris Dumez.
+
+ Add a test that would crash prior to the fix for this bug.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKitCocoa/WKNSDictionaryEmptyDictionaryCrash.mm: Added.
+ (TestWebKitAPI::TEST):
+
2018-11-19 Alex Christensen <achristen...@webkit.org>
Add SPI to disable JIT in a WKWebView
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (238407 => 238408)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2018-11-20 23:38:23 UTC (rev 238407)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2018-11-20 23:46:23 UTC (rev 238408)
@@ -792,6 +792,7 @@
CEBCA13A1E3A807A00C73293 /* page-without-csp.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CEBCA1371E3A803400C73293 /* page-without-csp.html */; };
CEBCA13B1E3A807A00C73293 /* page-without-csp-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CEBCA1361E3A803400C73293 /* page-without-csp-iframe.html */; };
D34E08761E4E42E1005FF14A /* WKWebViewGetContents.mm in Sources */ = {isa = PBXBuildFile; fileRef = D3BE5E341E4CE85E00FD563A /* WKWebViewGetContents.mm */; };
+ DF4B273921A47728009BD1CA /* WKNSDictionaryEmptyDictionaryCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF4B273821A47727009BD1CA /* WKNSDictionaryEmptyDictionaryCrash.mm */; };
E1220DCA155B28AA0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = E1220DC9155B287D0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html */; };
E194E1BD177E53C7009C4D4E /* StopLoadingFromDidReceiveResponse.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = E194E1BC177E534A009C4D4E /* StopLoadingFromDidReceiveResponse.html */; };
E324A6F02041C82000A76593 /* UniqueArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E398BC0F2041C76300387136 /* UniqueArray.cpp */; };
@@ -2066,6 +2067,7 @@
CEBCA1371E3A803400C73293 /* page-without-csp.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "page-without-csp.html"; sourceTree = "<group>"; };
D3BE5E341E4CE85E00FD563A /* WKWebViewGetContents.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewGetContents.mm; sourceTree = "<group>"; };
DC69AA621CF77C6500C6272F /* ScopedLambda.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScopedLambda.cpp; sourceTree = "<group>"; };
+ DF4B273821A47727009BD1CA /* WKNSDictionaryEmptyDictionaryCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSDictionaryEmptyDictionaryCrash.mm; sourceTree = "<group>"; };
E1220D9F155B25480013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MemoryCacheDisableWithinResourceLoadDelegate.mm; sourceTree = "<group>"; };
E1220DC9155B287D0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = MemoryCacheDisableWithinResourceLoadDelegate.html; sourceTree = "<group>"; };
E194E1BA177E5145009C4D4E /* StopLoadingFromDidReceiveResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StopLoadingFromDidReceiveResponse.mm; sourceTree = "<group>"; };
@@ -2514,6 +2516,7 @@
370CE2291F57343400E7410B /* WKContentViewTargetForAction.mm */,
51D124971E763AF8002B2820 /* WKHTTPCookieStore.mm */,
A5A729F01F622A9A00DE5A28 /* WKNavigationResponse.mm */,
+ DF4B273821A47727009BD1CA /* WKNSDictionaryEmptyDictionaryCrash.mm */,
375E0E151D66674400EFEC2C /* WKNSNumber.mm */,
37B47E2E1D64E7CA005F4EFF /* WKObject.mm */,
A14AAB611E78D7DE00C1ADC2 /* WKPDFView.mm */,
@@ -4168,6 +4171,7 @@
51D124981E763B02002B2820 /* WKHTTPCookieStore.mm in Sources */,
7CCE7F1D1A411AE600447C4C /* WKImageCreateCGImageCrash.cpp in Sources */,
A5A729F11F622AA700DE5A28 /* WKNavigationResponse.mm in Sources */,
+ DF4B273921A47728009BD1CA /* WKNSDictionaryEmptyDictionaryCrash.mm in Sources */,
375E0E171D66674400EFEC2C /* WKNSNumber.mm in Sources */,
37B47E301D64E7CA005F4EFF /* WKObject.mm in Sources */,
7C89D2AC1A69B80D003A5FDE /* WKPageConfiguration.cpp in Sources */,
Added: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKNSDictionaryEmptyDictionaryCrash.mm (0 => 238408)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKNSDictionaryEmptyDictionaryCrash.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKNSDictionaryEmptyDictionaryCrash.mm 2018-11-20 23:46:23 UTC (rev 238408)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 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.
+ */
+
+#import "config.h"
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED && WK_HAVE_C_SPI
+
+#import <WebKit/WKMutableDictionary.h>
+
+namespace TestWebKitAPI {
+
+TEST(WebKit, WKNSDictionaryEmptyDictionaryCrash)
+{
+ NSDictionary *dictionary = (NSDictionary *)WKMutableDictionaryCreate();
+ RELEASE_ASSERT([dictionary objectForKey:@"key"] == nil);
+}
+
+} // namespace TestWebKitAPI
+
+#endif
Property changes on: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKNSDictionaryEmptyDictionaryCrash.mm
___________________________________________________________________
Added: svn:eol-style
+native
\ No newline at end of property
