Title: [268915] releases/WebKitGTK/webkit-2.30/Source/WebCore
- Revision
- 268915
- Author
- [email protected]
- Date
- 2020-10-23 01:26:04 -0700 (Fri, 23 Oct 2020)
Log Message
Merge r268000 - [GTK][X11] WebProcess crash in WebCore::GLContextGLX::createPbufferContext() with NVidia proprietary drivers
https://bugs.webkit.org/show_bug.cgi?id=217323
Reviewed by Adrian Perez de Castro.
The returnedElements variable might remain uninitialized if the glXChooseFBConfig()
function call fails, leading to execution of the wrong code branch later.
* platform/graphics/glx/GLContextGLX.cpp:
(WebCore::GLContextGLX::createPbufferContext): Initialized the returnedElements variable.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog (268914 => 268915)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog 2020-10-23 08:26:00 UTC (rev 268914)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog 2020-10-23 08:26:04 UTC (rev 268915)
@@ -1,3 +1,16 @@
+2020-10-05 Enrique Ocaña González <[email protected]>
+
+ [GTK][X11] WebProcess crash in WebCore::GLContextGLX::createPbufferContext() with NVidia proprietary drivers
+ https://bugs.webkit.org/show_bug.cgi?id=217323
+
+ Reviewed by Adrian Perez de Castro.
+
+ The returnedElements variable might remain uninitialized if the glXChooseFBConfig()
+ function call fails, leading to execution of the wrong code branch later.
+
+ * platform/graphics/glx/GLContextGLX.cpp:
+ (WebCore::GLContextGLX::createPbufferContext): Initialized the returnedElements variable.
+
2020-10-15 Chris Lord <[email protected]>
[GTK][WPE] Add support for smooth scrolling animation with async scrolling
Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp (268914 => 268915)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2020-10-23 08:26:00 UTC (rev 268914)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2020-10-23 08:26:04 UTC (rev 268915)
@@ -221,7 +221,7 @@
0
};
- int returnedElements;
+ int returnedElements = 0;
Display* display = downcast<PlatformDisplayX11>(platformDisplay).native();
XUniquePtr<GLXFBConfig> configs(glXChooseFBConfig(display, 0, fbConfigAttributes, &returnedElements));
if (!returnedElements)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
