[Bf-blender-cvs] [4776a74bf7f] master: Fix T101974: Potential memoryleak GHOST_WindowWayland.newDrawingContext

Edward noreply at git.blender.org
Fri Oct 21 15:35:32 CEST 2022


Commit: 4776a74bf7f1ed60efee22290c5fea732d7e2e5a
Author: Edward
Date:   Fri Oct 21 15:35:20 2022 +0200
Branches: master
https://developer.blender.org/rB4776a74bf7f1ed60efee22290c5fea732d7e2e5a

Fix T101974: Potential memoryleak GHOST_WindowWayland.newDrawingContext

Reviewed By: jbakker

Maniphest Tasks: T101974

Differential Revision: https://developer.blender.org/D16309

===================================================================

M	intern/ghost/intern/GHOST_WindowWayland.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowWayland.cpp b/intern/ghost/intern/GHOST_WindowWayland.cpp
index b29c5efd8d4..986e18d7a87 100644
--- a/intern/ghost/intern/GHOST_WindowWayland.cpp
+++ b/intern/ghost/intern/GHOST_WindowWayland.cpp
@@ -946,7 +946,12 @@ GHOST_Context *GHOST_WindowWayland::newDrawingContext(GHOST_TDrawingContextType
                                      EGL_OPENGL_API);
   }
 
-  return (context->initializeDrawingContext() == GHOST_kSuccess) ? context : nullptr;
+  if (context->initializeDrawingContext()) {
+    return context;
+  }
+
+  delete context;
+  return nullptr;
 }
 
 /** \} */



More information about the Bf-blender-cvs mailing list