Don't crash when no WM is present.

CR: Sam Lantinga.
libsdl-org · Nov 27, 2013 · 2bb344d6dc68acd8e9b8687ce2324e89b62e1f91 · 2bb344d
1 parent 8574c08
commit 2bb344d6dc68acd8e9b8687ce2324e89b62e1f91
diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java
diff --git a/premake/Linux/SDL_config_premake.h b/premake/Linux/SDL_config_premake.h
diff --git a/premake/MinGW/SDL_config_premake.h b/premake/MinGW/SDL_config_premake.h
diff --git a/premake/VisualC/VS2008/SDL_config_premake.h b/premake/VisualC/VS2008/SDL_config_premake.h
diff --git a/premake/VisualC/VS2010/SDL_config_premake.h b/premake/VisualC/VS2010/SDL_config_premake.h
diff --git a/premake/VisualC/VS2012/SDL_config_premake.h b/premake/VisualC/VS2012/SDL_config_premake.h
diff --git a/premake/Xcode-iOS/SDL_config_premake.h b/premake/Xcode-iOS/SDL_config_premake.h
diff --git a/premake/Xcode/Xcode3/SDL_config_premake.h b/premake/Xcode/Xcode3/SDL_config_premake.h
diff --git a/premake/Xcode/Xcode4/SDL_config_premake.h b/premake/Xcode/Xcode4/SDL_config_premake.h
diff --git a/premake/config/SDL_config_cygwin.template.h b/premake/config/SDL_config_cygwin.template.h
diff --git a/premake/config/SDL_config_iphoneos.template.h b/premake/config/SDL_config_iphoneos.template.h
diff --git a/premake/config/SDL_config_linux.template.h b/premake/config/SDL_config_linux.template.h
diff --git a/premake/config/SDL_config_macosx.template.h b/premake/config/SDL_config_macosx.template.h
diff --git a/premake/config/SDL_config_minimal.template.h b/premake/config/SDL_config_minimal.template.h
diff --git a/premake/config/SDL_config_windows.template.h b/premake/config/SDL_config_windows.template.h
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
diff --git a/src/video/windows/SDL_windowswindow.c b/src/video/windows/SDL_windowswindow.c
diff --git a/src/video/windows/SDL_windowswindow.h b/src/video/windows/SDL_windowswindow.h
diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
@@ -440,8 +440,8 @@ X11_CheckWindowManager(_THIS)
     Atom _NET_SUPPORTING_WM_CHECK;
     int status, real_format;
     Atom real_type;
-    unsigned long items_read, items_left;
-    unsigned char *propdata;
+    unsigned long items_read = 0, items_left = 0;
+    unsigned char *propdata = NULL;
     Window wm_window = 0;
 #ifdef DEBUG_WINDOW_MANAGER
     char *wm_name;
@@ -453,20 +453,24 @@ X11_CheckWindowManager(_THIS)
 
     _NET_SUPPORTING_WM_CHECK = X11_XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False);
     status = X11_XGetWindowProperty(display, DefaultRootWindow(display), _NET_SUPPORTING_WM_CHECK, 0L, 1L, False, XA_WINDOW, &real_type, &real_format, &items_read, &items_left, &propdata);
-    if (status == Success && items_read) {
-        wm_window = ((Window*)propdata)[0];
-    }
-    if (propdata) {
-        X11_XFree(propdata);
+    if (status == Success) {
+        if (items_read) {
+            wm_window = ((Window*)propdata)[0];
+        }
+        if (propdata) {
+            X11_XFree(propdata);
+            propdata = NULL;
+        }
     }
 
     if (wm_window) {
         status = X11_XGetWindowProperty(display, wm_window, _NET_SUPPORTING_WM_CHECK, 0L, 1L, False, XA_WINDOW, &real_type, &real_format, &items_read, &items_left, &propdata);
         if (status != Success || !items_read || wm_window != ((Window*)propdata)[0]) {
             wm_window = None;
         }
-        if (propdata) {
+        if (status == Success && propdata) {
             X11_XFree(propdata);
+            propdata = NULL;
         }
     }
 

diff --git a/visualtest/config.h b/visualtest/config.h
diff --git a/visualtest/docs/html/bc_s.png b/visualtest/docs/html/bc_s.png
diff --git a/visualtest/docs/html/bdwn.png b/visualtest/docs/html/bdwn.png
diff --git a/visualtest/docs/html/closed.png b/visualtest/docs/html/closed.png
diff --git a/visualtest/docs/html/doxygen.png b/visualtest/docs/html/doxygen.png
diff --git a/visualtest/docs/html/ftv2blank.png b/visualtest/docs/html/ftv2blank.png
diff --git a/visualtest/docs/html/ftv2cl.png b/visualtest/docs/html/ftv2cl.png
diff --git a/visualtest/docs/html/ftv2doc.png b/visualtest/docs/html/ftv2doc.png
diff --git a/visualtest/docs/html/ftv2folderclosed.png b/visualtest/docs/html/ftv2folderclosed.png
diff --git a/visualtest/docs/html/ftv2folderopen.png b/visualtest/docs/html/ftv2folderopen.png
diff --git a/visualtest/docs/html/ftv2lastnode.png b/visualtest/docs/html/ftv2lastnode.png
diff --git a/visualtest/docs/html/ftv2link.png b/visualtest/docs/html/ftv2link.png
diff --git a/visualtest/docs/html/ftv2mlastnode.png b/visualtest/docs/html/ftv2mlastnode.png
diff --git a/visualtest/docs/html/ftv2mnode.png b/visualtest/docs/html/ftv2mnode.png
diff --git a/visualtest/docs/html/ftv2mo.png b/visualtest/docs/html/ftv2mo.png
diff --git a/visualtest/docs/html/ftv2node.png b/visualtest/docs/html/ftv2node.png
diff --git a/visualtest/docs/html/ftv2ns.png b/visualtest/docs/html/ftv2ns.png
diff --git a/visualtest/docs/html/ftv2plastnode.png b/visualtest/docs/html/ftv2plastnode.png
diff --git a/visualtest/docs/html/ftv2pnode.png b/visualtest/docs/html/ftv2pnode.png
diff --git a/visualtest/docs/html/ftv2splitbar.png b/visualtest/docs/html/ftv2splitbar.png
diff --git a/visualtest/docs/html/ftv2vertline.png b/visualtest/docs/html/ftv2vertline.png
diff --git a/visualtest/docs/html/nav_f.png b/visualtest/docs/html/nav_f.png
diff --git a/visualtest/docs/html/nav_g.png b/visualtest/docs/html/nav_g.png
diff --git a/visualtest/docs/html/nav_h.png b/visualtest/docs/html/nav_h.png
diff --git a/visualtest/docs/html/open.png b/visualtest/docs/html/open.png
diff --git a/visualtest/docs/html/search/close.png b/visualtest/docs/html/search/close.png
diff --git a/visualtest/docs/html/search/mag_sel.png b/visualtest/docs/html/search/mag_sel.png
diff --git a/visualtest/docs/html/search/search_l.png b/visualtest/docs/html/search/search_l.png
diff --git a/visualtest/docs/html/search/search_m.png b/visualtest/docs/html/search/search_m.png
diff --git a/visualtest/docs/html/search/search_r.png b/visualtest/docs/html/search/search_r.png
diff --git a/visualtest/docs/html/sync_off.png b/visualtest/docs/html/sync_off.png
diff --git a/visualtest/docs/html/sync_on.png b/visualtest/docs/html/sync_on.png
diff --git a/visualtest/docs/html/tab_a.png b/visualtest/docs/html/tab_a.png
diff --git a/visualtest/docs/html/tab_b.png b/visualtest/docs/html/tab_b.png
diff --git a/visualtest/docs/html/tab_h.png b/visualtest/docs/html/tab_h.png
diff --git a/visualtest/docs/html/tab_s.png b/visualtest/docs/html/tab_s.png
diff --git a/visualtest/include/SDL_visualtest_action_configparser.h b/visualtest/include/SDL_visualtest_action_configparser.h
diff --git a/visualtest/include/SDL_visualtest_exhaustive_variator.h b/visualtest/include/SDL_visualtest_exhaustive_variator.h
diff --git a/visualtest/include/SDL_visualtest_harness_argparser.h b/visualtest/include/SDL_visualtest_harness_argparser.h
diff --git a/visualtest/include/SDL_visualtest_mischelper.h b/visualtest/include/SDL_visualtest_mischelper.h
diff --git a/visualtest/include/SDL_visualtest_parsehelper.h b/visualtest/include/SDL_visualtest_parsehelper.h
diff --git a/visualtest/include/SDL_visualtest_process.h b/visualtest/include/SDL_visualtest_process.h
diff --git a/visualtest/include/SDL_visualtest_random_variator.h b/visualtest/include/SDL_visualtest_random_variator.h
diff --git a/visualtest/include/SDL_visualtest_rwhelper.h b/visualtest/include/SDL_visualtest_rwhelper.h
diff --git a/visualtest/include/SDL_visualtest_screenshot.h b/visualtest/include/SDL_visualtest_screenshot.h
diff --git a/visualtest/include/SDL_visualtest_sut_configparser.h b/visualtest/include/SDL_visualtest_sut_configparser.h
diff --git a/visualtest/include/SDL_visualtest_variator_common.h b/visualtest/include/SDL_visualtest_variator_common.h
diff --git a/visualtest/include/SDL_visualtest_variators.h b/visualtest/include/SDL_visualtest_variators.h
diff --git a/visualtest/src/action_configparser.c b/visualtest/src/action_configparser.c
diff --git a/visualtest/src/harness_argparser.c b/visualtest/src/harness_argparser.c
diff --git a/visualtest/src/linux/linux_process.c b/visualtest/src/linux/linux_process.c
diff --git a/visualtest/src/mischelper.c b/visualtest/src/mischelper.c
diff --git a/visualtest/src/parsehelper.c b/visualtest/src/parsehelper.c
diff --git a/visualtest/src/rwhelper.c b/visualtest/src/rwhelper.c
diff --git a/visualtest/src/screenshot.c b/visualtest/src/screenshot.c
diff --git a/visualtest/src/sut_configparser.c b/visualtest/src/sut_configparser.c
diff --git a/visualtest/src/testharness.c b/visualtest/src/testharness.c
diff --git a/visualtest/src/variator_common.c b/visualtest/src/variator_common.c
diff --git a/visualtest/src/variator_exhaustive.c b/visualtest/src/variator_exhaustive.c
diff --git a/visualtest/src/variator_random.c b/visualtest/src/variator_random.c
diff --git a/visualtest/src/variators.c b/visualtest/src/variators.c
diff --git a/visualtest/src/windows/windows_process.c b/visualtest/src/windows/windows_process.c
diff --git a/visualtest/src/windows/windows_screenshot.c b/visualtest/src/windows/windows_screenshot.c
diff --git a/visualtest/unittest/testquit.c b/visualtest/unittest/testquit.c