Changeset 200046 in webkit

Timestamp:

Apr 25, 2016 1:48:04 PM (8 years ago)

Author:

berto@igalia.com

Message:

[GTK] Crashes if DISPLAY is unset
​https://bugs.webkit.org/show_bug.cgi?id=156972

Reviewed by Carlos Garcia Campos.

If DISPLAY is unset then m_display will be NULL, crashing WebKit
when XCloseDisplay is called in the PlatformDisplayX11 destructor.

• platform/graphics/x11/PlatformDisplayX11.cpp:

(WebCore::PlatformDisplayX11::~PlatformDisplayX11):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/x11/PlatformDisplayX11.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-25  Alberto Garcia  <berto@igalia.com>
+
+        [GTK] Crashes if DISPLAY is unset
+        https://bugs.webkit.org/show_bug.cgi?id=156972
+
+        Reviewed by Carlos Garcia Campos.
+
+        If DISPLAY is unset then m_display will be NULL, crashing WebKit
+        when XCloseDisplay is called in the PlatformDisplayX11 destructor.
+
+        * platform/graphics/x11/PlatformDisplayX11.cpp:
+        (WebCore::PlatformDisplayX11::~PlatformDisplayX11):
+
 2016-04-25  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp

@@ -38 +38 @@
 PlatformDisplayX11::PlatformDisplayX11()
     : m_display(XOpenDisplay(nullptr))
-    , m_ownedDisplay(true)
 {
+    m_ownedDisplay = m_display != nullptr;
 }