Attachment 358825 Details for Bug 193334 – Patch

[patch] Patch

bug-193334-20190111103803.patch (text/plain), 2.30 KB, created by Eric Carlson on 2019-01-10 13:38:05 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2019-01-10 13:38:05 PST

Size: 2.30 KB

patch

obsolete

>Subversion Revision: 239676
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 4c199aaaae5acbb24d144cde08b4b8dd13b49b07..f3e185bd50adafa91f9dfe95cfd08c26bf9b5ee0 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-10  Eric Carlson  <eric.carlson@apple.com>
>+
>+        DeviceID hash salt manager can be NULL
>+        https://bugs.webkit.org/show_bug.cgi?id=193334
>+        <rdar://problem/47179650>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
>+        (WebKit::UserMediaPermissionRequestManagerProxy::enumerateMediaDevicesForFrame): NULL check
>+        websiteDataStore.deviceIdHashSaltStorage before using it.
>+
> 2019-01-07  Alex Christensen  <achristensen@webkit.org>
> 
>         Modernize CacheModel and disk cache fetching and clearing
>diff --git a/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp b/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp
>index 4ef5dcc365aa39ae606d0bbbf38ef449fe4905d0..e736dfed972b0216b7427dcabc4b3c2e20a4fc49 100644
>--- a/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp
>+++ b/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp
>@@ -459,6 +459,10 @@ void UserMediaPermissionRequestManagerProxy::enumerateMediaDevicesForFrame(uint6
> 
>     auto requestID = generateRequestID();
>     auto completionHandler = [this, requestID, userMediaID, requestOrigin = userMediaDocumentOrigin.copyRef(), topOrigin = topLevelDocumentOrigin.copyRef()](bool originHasPersistentAccess) {
>+
>+        if (!m_page.isValid() || !m_page.websiteDataStore().deviceIdHashSaltStorage())
>+            return;
>+
>         m_page.websiteDataStore().deviceIdHashSaltStorage()->deviceIdHashSaltForOrigin(requestOrigin.get(), topOrigin.get(), [this, weakThis = makeWeakPtr(*this), requestID, userMediaID, &originHasPersistentAccess] (String&& deviceIDHashSalt) {
>             if (!weakThis)
>                 return;
>@@ -466,7 +470,7 @@ void UserMediaPermissionRequestManagerProxy::enumerateMediaDevicesForFrame(uint6
>             if (!pendingRequest)
>                 return;
> 
>-            if (!m_page.isValid() || !m_page.websiteDataStore().deviceIdHashSaltStorage())
>+            if (!m_page.isValid())
>                 return;
> 
>             syncWithWebCorePrefs();

Actions: View | Formatted Diff | Diff

Attachments on bug 193334: 358825 | 358841 | 358842