From ff651a08b50cade1adf6e4d7a810500c88eb1987 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Wed, 31 Aug 2022 14:26:58 +1000
Subject: Fix returning a freed context when initialization fails for
 GHOST/Win32

---
 intern/ghost/intern/GHOST_SystemWin32.cpp | 1 +
 intern/ghost/intern/GHOST_WindowWin32.cpp | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index c03d468160a..b583d39dd1f 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -353,6 +353,7 @@ GHOST_ContextD3D *GHOST_SystemWin32::createOffscreenContextD3D()
   context = new GHOST_ContextD3D(false, wnd);
   if (context->initializeDrawingContext() == GHOST_kFailure) {
     delete context;
+    context = nullptr;
   }
 
   return context;
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 4d8e0d492d9..50ee9385e39 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -624,11 +624,9 @@ GHOST_Context *GHOST_WindowWin32::newDrawingContext(GHOST_TDrawingContextType ty
     GHOST_Context *context;
 
     context = new GHOST_ContextD3D(false, m_hWnd);
-    if (context->initializeDrawingContext()) {
-      return context;
-    }
-    else {
+    if (!context->initializeDrawingContext()) {
       delete context;
+      context = nullptr;
     }
 
     return context;
-- 
cgit v1.2.3