Changeset 259505 in webkit

Timestamp:

Apr 3, 2020 1:13:41 PM (4 years ago)

Author:

ddkilzer@apple.com

Message:

[Cocoa] Update MESSAGE_CHECK macros used in WebProcessProxy::didCreateSleepDisabler/WebProcessProxy::didDestroySleepDisabler
<​https://webkit.org/b/209981>
<rdar://problem/61237674>

Reviewed by Darin Adler.

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::didCreateSleepDisabler):

• Remove MESSAGE_CHECK for identifier since decoding detects invalid values.
• Add MESSAGE_CHECK for reason since a NULL string would cause CFStringCreateWithCString() to crash later.

(WebKit::WebProcessProxy::didDestroySleepDisabler):

• Remove MESSAGE_CHECK for identifier since decoding detects invalid values.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-03  David Kilzer  <ddkilzer@apple.com>
+
+        [Cocoa] Update MESSAGE_CHECK macros used in WebProcessProxy::didCreateSleepDisabler/WebProcessProxy::didDestroySleepDisabler
+        <https://webkit.org/b/209981>
+        <rdar://problem/61237674>
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::didCreateSleepDisabler):
+        - Remove MESSAGE_CHECK for `identifier` since decoding detects
+          invalid values.
+        - Add MESSAGE_CHECK for `reason` since a NULL string would cause
+          CFStringCreateWithCString() to crash later.
+        (WebKit::WebProcessProxy::didDestroySleepDisabler):
+        - Remove MESSAGE_CHECK for `identifier` since decoding detects
+          invalid values.
+
 2020-04-03  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -1783 +1783 @@
 void WebProcessProxy::didCreateSleepDisabler(SleepDisablerIdentifier identifier, const String& reason, bool display)
 {
-    MESSAGE_CHECK(identifier);
+    MESSAGE_CHECK(!reason.isNull());
     auto sleepDisabler = makeUnique<WebCore::SleepDisabler>(reason.utf8().data(), display ? PAL::SleepDisabler::Type::Display : PAL::SleepDisabler::Type::System);
     m_sleepDisablers.add(identifier, WTFMove(sleepDisabler));
@@ -1790 +1790 @@
 void WebProcessProxy::didDestroySleepDisabler(SleepDisablerIdentifier identifier)
 {
-    MESSAGE_CHECK(identifier);
     m_sleepDisablers.remove(identifier);
 }