Attachment 346724 Details for Bug 188387 – Patch

[patch] Patch

bug-188387-20180807130527.patch (text/plain), 1.68 KB, created by Justin Fan on 2018-08-07 13:05:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Fan

Created: 2018-08-07 13:05:28 PDT

Size: 1.68 KB

patch

obsolete

>Subversion Revision: 234659
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ec38d74d5e8ffb0b4428d55ad0a2e572adf60074..1e5858617c2e9a39edaf029f5929f6c9ee121a87 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-07  Justin Fan  <justin_fan@apple.com>
>+
>+        Prevent querying for renderer info for disconnected or uninitialized displays
>+        https://bugs.webkit.org/show_bug.cgi?id=188387
>+        <rdar://problem/42588769>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Calling CGL functions with a NULL displayMask crashes the process.
>+
>+        No tests; requires multiple displays.
>+
>+        * platform/mac/PlatformScreenMac.mm:
>+        (WebCore::collectScreenProperties):
>+
> 2018-08-07  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, suppress warnings to fix the build.
>diff --git a/Source/WebCore/platform/mac/PlatformScreenMac.mm b/Source/WebCore/platform/mac/PlatformScreenMac.mm
>index e78434f31e5b583fd5f0fc91527779704b8da5ff..6b0794194032bde3fc400cbf0ccd600c8ffb9bcf 100644
>--- a/Source/WebCore/platform/mac/PlatformScreenMac.mm
>+++ b/Source/WebCore/platform/mac/PlatformScreenMac.mm
>@@ -130,7 +130,8 @@ ScreenProperties collectScreenProperties()
>         IORegistryGPUID gpuID = 0;
> 
> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
>-        gpuID = gpuIDForDisplayMask(displayMask);
>+        if (displayMask)
>+            gpuID = gpuIDForDisplayMask(displayMask);
> #endif
> 
>         screenProperties.screenDataMap.set(displayID, ScreenData { screenAvailableRect, screenRect, colorSpace, screenDepth, screenDepthPerComponent, screenSupportsExtendedColor, screenHasInvertedColors, screenIsMonochrome, displayMask, gpuID });

Actions: View | Formatted Diff | Diff

Attachments on bug 188387: 346724