Changeset 229526 in webkit

Timestamp:

Mar 12, 2018 2:28:26 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r229525 - [GTK] Crash in WebCore::PlatformDisplayWayland::~PlatformDisplayWayland
​https://bugs.webkit.org/show_bug.cgi?id=176490

Reviewed by Žan Doberšek.

Destroy the wl_display with wl_display_disconnect() (client process API), not
wl_display_destroy() (server process API). It has to be destroyed last, so explicitly
destroy the wl_registry and wl_compositor first.

• platform/graphics/wayland/PlatformDisplayWayland.cpp:

(WebCore::PlatformDisplayWayland::~PlatformDisplayWayland):

Location:

releases/WebKitGTK/webkit-2.20/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/wayland/PlatformDisplayWayland.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-12  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] Crash in WebCore::PlatformDisplayWayland::~PlatformDisplayWayland
+        https://bugs.webkit.org/show_bug.cgi?id=176490
+
+        Reviewed by Žan Doberšek.
+
+        Destroy the wl_display with wl_display_disconnect() (client process API), not
+        wl_display_destroy() (server process API). It has to be destroyed last, so explicitly
+        destroy the wl_registry and wl_compositor first.
+
+        * platform/graphics/wayland/PlatformDisplayWayland.cpp:
+        (WebCore::PlatformDisplayWayland::~PlatformDisplayWayland):
+
 2018-03-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp

@@ -68 +68 @@
 PlatformDisplayWayland::~PlatformDisplayWayland()
 {
-    if (m_nativeDisplayOwned == NativeDisplayOwned::Yes)
-        wl_display_destroy(m_display);
+    if (m_nativeDisplayOwned == NativeDisplayOwned::Yes) {
+        m_compositor = nullptr;
+        m_registry = nullptr;
+        wl_display_disconnect(m_display);
+    }
 }