Changeset 280838 in webkit

Timestamp:

Aug 10, 2021, 2:33:28 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r274160 - [IPC Hardening] IPC::decode(Decoder& decoder, RetainPtr<CFDictionaryRef>&) should make sure keys & values aren't null
​https://bugs.webkit.org/show_bug.cgi?id=222980

Reviewed by Geoffrey Garen.

[NSMutableDictionary setObject:forKey:] throws an exception when the given object or key is nil. The dictionary decoder
should therefore fail nicely when either of these is nil, instead of crashing.

• Shared/cf/ArgumentCodersCF.cpp:

(IPC::decode):

Location:

releases/WebKitGTK/webkit-2.32/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/cf/ArgumentCodersCF.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-09  Chris Dumez  <cdumez@apple.com>
+
+        [IPC Hardening] IPC::decode(Decoder& decoder, RetainPtr<CFDictionaryRef>&) should make sure keys & values aren't null
+        https://bugs.webkit.org/show_bug.cgi?id=222980
+
+        Reviewed by Geoffrey Garen.
+
+        [NSMutableDictionary setObject:forKey:] throws an exception when the given object or key is nil. The dictionary decoder
+        should therefore fail nicely when either of these is nil, instead of crashing.
+
+        * Shared/cf/ArgumentCodersCF.cpp:
+        (IPC::decode):
+
 2021-03-09  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp

@@ -459 +459 @@
     for (uint64_t i = 0; i < size; ++i) {
         RetainPtr<CFTypeRef> key;
-        if (!decode(decoder, key))
+        if (!decode(decoder, key) || !key)
             return false;
 
         RetainPtr<CFTypeRef> value;
-        if (!decode(decoder, value))
+        if (!decode(decoder, value) || !value)
             return false;