Changeset 259775 in webkit

Timestamp:

Apr 8, 2020, 6:37:30 PM (6 years ago)

Author:

ddkilzer@apple.com

Message:

UserMediaCaptureManagerProxy::clone should validate its parameters
<​https://webkit.org/b/210221>
<rdar://problem/61063019>

Reviewed by Alex Christensen.

• UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:

(MESSAGE_CHECK): Define (and undef) new macro for assertion.
(WebKit::UserMediaCaptureManagerProxy::clone): Change ASSERT()
to MESSAGE_CHECK().

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-08  David Kilzer  <ddkilzer@apple.com>
+
+        UserMediaCaptureManagerProxy::clone should validate its parameters
+        <https://webkit.org/b/210221>
+        <rdar://problem/61063019>
+
+        Reviewed by Alex Christensen.
+
+        * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:
+        (MESSAGE_CHECK): Define (and undef) new macro for assertion.
+        (WebKit::UserMediaCaptureManagerProxy::clone): Change ASSERT()
+        to MESSAGE_CHECK().
+
 2020-04-08  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp

@@ -29 +29 @@
 #if PLATFORM(COCOA) && ENABLE(MEDIA_STREAM)
 
+#include "Connection.h"
 #include "SharedRingBufferStorage.h"
 #include "UserMediaCaptureManagerMessages.h"
@@ -42 +43 @@
 #include <WebCore/WebAudioBufferList.h>
 #include <wtf/UniqueRef.h>
+
+#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, &m_connectionProxy->connection())
 
 namespace WebKit {
@@ -295 +298 @@
 void UserMediaCaptureManagerProxy::clone(RealtimeMediaSourceIdentifier clonedID, RealtimeMediaSourceIdentifier newSourceID)
 {
-    ASSERT(m_proxies.contains(clonedID));
-    ASSERT(!m_proxies.contains(newSourceID));
+    MESSAGE_CHECK(m_proxies.contains(clonedID));
+    MESSAGE_CHECK(!m_proxies.contains(newSourceID));
     if (auto* proxy = m_proxies.get(clonedID))
         m_proxies.add(newSourceID, makeUnique<SourceProxy>(newSourceID, m_connectionProxy->connection(), proxy->source().clone()));
@@ -325 +328 @@
 }
 
+#undef MESSAGE_CHECK
+
 #endif