Title: [200081] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 200081
- Author
- [email protected]
- Date
- 2016-04-26 06:32:57 -0700 (Tue, 26 Apr 2016)
Log Message
Merge r200046 - [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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (200080 => 200081)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-26 13:20:38 UTC (rev 200080)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-26 13:32:57 UTC (rev 200081)
@@ -1,3 +1,16 @@
+2016-04-25 Alberto Garcia <[email protected]>
+
+ [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-20 Chris Dumez <[email protected]>
Crash under WebCore::TextIterator::subrange()
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp (200080 => 200081)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-04-26 13:20:38 UTC (rev 200080)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-04-26 13:32:57 UTC (rev 200081)
@@ -37,8 +37,8 @@
PlatformDisplayX11::PlatformDisplayX11()
: m_display(XOpenDisplay(nullptr))
- , m_ownedDisplay(true)
{
+ m_ownedDisplay = m_display != nullptr;
}
PlatformDisplayX11::PlatformDisplayX11(Display* display)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
