Changeset 34513 in vbox for trunk/src

Timestamp:

Nov 30, 2010 1:35:16 PM (14 years ago)

Author:

vboxsync

Message:

Frontends/VBoxSDL: fix SDL uninit code, in certain failure cases it can be called without being completely initialized and that could result in a crash

File:

• trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -67 +67 @@
 #endif /* VBOX_SECURELABEL */
 
-static SDL_Surface *gWMIcon;                    /**< the application icon */
-static RTNATIVETHREAD gSdlNativeThread;         /**< the SDL thread */
+static bool gfSdlInitialized = false;           /**< if SDL was initialized */
+static SDL_Surface *gWMIcon = NULL;             /**< the application icon */
+static RTNATIVETHREAD gSdlNativeThread = NIL_RTNATIVETHREAD; /**< the SDL thread */
 
 //
@@ -185 +186 @@
         return false;
     }
+    gfSdlInitialized = true;
 
     const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();
@@ -240 +242 @@
 void VBoxSDLFB::uninit()
 {
-    AssertMsg(gSdlNativeThread == RTThreadNativeSelf(), ("Wrong thread! SDL is not threadsafe!\n"));
-    SDL_QuitSubSystem(SDL_INIT_VIDEO);
-    if (gWMIcon)
-    {
-        SDL_FreeSurface(gWMIcon);
-        gWMIcon = NULL;
+    if (gfSdlInitialized)
+    {
+        AssertMsg(gSdlNativeThread == RTThreadNativeSelf(), ("Wrong thread! SDL is not threadsafe!\n"));
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+        if (gWMIcon)
+        {
+            SDL_FreeSurface(gWMIcon);
+            gWMIcon = NULL;
+        }
     }
 }