[Bf-blender-cvs] [6dec69daa8f] xr-controller-support: XR: Fix crash on file read with active session

[Peter Kim]

Commit: 6dec69daa8fa68be41409a496f96ada308cd33bd
Author: Peter Kim
Date:   Sat Aug 7 18:31:12 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rB6dec69daa8fa68be41409a496f96ada308cd33bd

XR: Fix crash on file read with active session

Add null check for runtime data since it could already have been
freed via wm_xr_exit() prior to the session exit callback.

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

M	source/blender/windowmanager/xr/intern/wm_xr.c
M	source/blender/windowmanager/xr/intern/wm_xr_intern.h
M	source/blender/windowmanager/xr/intern/wm_xr_session.c

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

diff --git a/source/blender/windowmanager/xr/intern/wm_xr.c b/source/blender/windowmanager/xr/intern/wm_xr.c
index cf4580f4c19..2e55f082153 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr.c
@@ -168,6 +168,9 @@ void wm_xr_runtime_data_free(wmXrRuntimeData **runtime)
     /* Prevent recursive GHOST_XrContextDestroy() call by NULL'ing the context pointer before the
      * first call, see comment above. */
     (*runtime)->context = NULL;
+
+    wm_xr_session_data_free(&(*runtime)->session_state);
+
     GHOST_XrContextDestroy(context);
   }
   MEM_SAFE_FREE(*runtime);
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_intern.h b/source/blender/windowmanager/xr/intern/wm_xr_intern.h
index 5d8c2e2a117..fbec4ee7503 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_intern.h
+++ b/source/blender/windowmanager/xr/intern/wm_xr_intern.h
@@ -216,6 +216,7 @@ typedef struct wmXrActionSet {
 
 wmXrRuntimeData *wm_xr_runtime_data_create(void);
 void wm_xr_runtime_data_free(wmXrRuntimeData **runtime);
+void wm_xr_session_data_free(wmXrSessionState *state);
 
 void wm_xr_session_draw_data_update(wmXrSessionState *state,
                                     const XrSessionSettings *settings,
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c b/source/blender/windowmanager/xr/intern/wm_xr_session.c
index 65f43bfbc89..a99a5d74dd5 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c
@@ -128,7 +128,7 @@ static void wm_xr_session_controller_data_free(wmXrSessionState *state)
   }
 }
 
-static void wm_xr_session_data_free(wmXrSessionState *state)
+void wm_xr_session_data_free(wmXrSessionState *state)
 {
   BLI_freelistN(&state->eyes);
   wm_xr_session_controller_data_free(state);
@@ -137,6 +137,10 @@ static void wm_xr_session_data_free(wmXrSessionState *state)
 static void wm_xr_session_exit_cb(void *customdata)
 {
   wmXrData *xr_data = customdata;
+  if (!xr_data->runtime) {
+    return;
+  }
+
   XrSessionSettings *settings = &xr_data->session_settings;
   wmXrSessionState *state = &xr_data->runtime->session_state;
 
@@ -160,7 +164,6 @@ static void wm_xr_session_exit_cb(void *customdata)
   }
 
   /* Free the entire runtime data (including session state and context), to play safe. */
-  wm_xr_session_data_free(state);
   wm_xr_runtime_data_free(&xr_data->runtime);
 }