Changeset 260347 in webkit

Timestamp:

Apr 19, 2020 7:18:32 PM (4 years ago)

Author:

ddkilzer@apple.com

Message:

[IPC hardening] Use MESSAGE_CHECK in WebPageProxy::loadRecentSearches() and WebPageProxy::saveRecentSearches()
<​https://webkit.org/b/210683>
<rdar://problem/59240446>

Reviewed by Geoffrey Garen.

• UIProcess/Cocoa/WebPageProxyCocoa.mm:

(MESSAGE_CHECK): Add.
(MESSAGE_CHECK_COMPLETION): Add.
(WebKit::WebPageProxy::saveRecentSearches):
(WebKit::WebPageProxy::loadRecentSearches):

• Replace boolean check of const String& with MESSAGE_CHECK.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebPageProxyCocoa.mm (modified) (6 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-19  David Kilzer  <ddkilzer@apple.com>
+
+        [IPC hardening] Use MESSAGE_CHECK in WebPageProxy::loadRecentSearches() and WebPageProxy::saveRecentSearches()
+        <https://webkit.org/b/210683>
+        <rdar://problem/59240446>
+
+        Reviewed by Geoffrey Garen.
+
+        * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+        (MESSAGE_CHECK): Add.
+        (MESSAGE_CHECK_COMPLETION): Add.
+        (WebKit::WebPageProxy::saveRecentSearches):
+        (WebKit::WebPageProxy::loadRecentSearches):
+        - Replace boolean check of const String& with MESSAGE_CHECK.
+
 2020-04-18  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29 +29 @@
 #import "APIAttachment.h"
 #import "APIUIClient.h"
+#import "Connection.h"
 #import "DataDetectionResult.h"
 #import "InsertTextOptions.h"
@@ -55 +56 @@
 #endif
 
+#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, process().connection())
+#define MESSAGE_CHECK_COMPLETION(assertion, completion) MESSAGE_CHECK_COMPLETION_BASE(assertion, process().connection(), completion)
+
 namespace WebKit {
 using namespace WebCore;
@@ -67 +71 @@
 void WebPageProxy::saveRecentSearches(const String& name, const Vector<WebCore::RecentSearch>& searchItems)
 {
-    if (!name) {
-        // FIXME: This should be a message check.
-        return;
-    }
+    MESSAGE_CHECK(!name.isNull());
 
     WebCore::saveRecentSearches(name, searchItems);
@@ -77 +78 @@
 void WebPageProxy::loadRecentSearches(const String& name, CompletionHandler<void(Vector<WebCore::RecentSearch>&&)>&& completionHandler)
 {
-    if (!name) {
-        // FIXME: This should be a message check.
-        return completionHandler({ });
-    }
+    MESSAGE_CHECK_COMPLETION(!name.isNull(), completionHandler({ }));
 
     completionHandler(WebCore::loadRecentSearches(name));
@@ -391 +389 @@
 
 } // namespace WebKit
+
+#undef MESSAGE_CHECK_COMPLETION
+#undef MESSAGE_CHECK