Changeset 206881 in webkit

Timestamp:

Oct 6, 2016 2:03:54 PM (8 years ago)

Author:

andersca@apple.com

Message:

Crash when ApplePaySession.completeMerchantValidation is not passed a dictionary
​https://bugs.webkit.org/show_bug.cgi?id=163074
rdar://problem/27824842

Reviewed by Tim Horton.

Raise a type error on a null initializer object.

• Modules/applepay/ApplePaySession.cpp:

(WebCore::ApplePaySession::completeMerchantValidation):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/applepay/ApplePaySession.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-06  Anders Carlsson  <andersca@apple.com>
+
+        Crash when ApplePaySession.completeMerchantValidation is not passed a dictionary
+        https://bugs.webkit.org/show_bug.cgi?id=163074
+        rdar://problem/27824842
+
+        Reviewed by Tim Horton.
+
+        Raise a type error on a null initializer object.
+
+        * Modules/applepay/ApplePaySession.cpp:
+        (WebCore::ApplePaySession::completeMerchantValidation):
+
 2016-10-06  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp

@@ -844 +844 @@
     }
 
+    if (!merchantSessionDictionary.initializerObject()) {
+        ec = TypeError;
+        return;
+    }
+
     auto& document = *downcast<Document>(scriptExecutionContext());
     auto& window = *document.domWindow();