Changeset 268915 in webkit

Timestamp:

Oct 23, 2020, 1:26:04 AM (6 years ago)

Author:

Carlos Garcia Campos

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.

Location:

releases/WebKitGTK/webkit-2.30/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/glx/GLContextGLX.cpp (modified) (1 diff)

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

@@ +1 @@
+2020-10-05  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [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  <clord@igalia.com>
 

releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp

@@ -222 +222 @@
     };
 
-    int returnedElements;
+    int returnedElements = 0;
     Display* display = downcast<PlatformDisplayX11>(platformDisplay).native();
     XUniquePtr<GLXFBConfig> configs(glXChooseFBConfig(display, 0, fbConfigAttributes, &returnedElements));