From 7cf90fa84564259d6ef67cd63017a6cdec385f5a Mon Sep 17 00:00:00 2001 From: okan Date: Sun, 2 Feb 2014 16:13:50 +0000 Subject: Unlike free(3), XFree(3) can't be passed a NULL pointer. --- screen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/screen.c b/screen.c index ce65e3b..26249d3 100644 --- a/screen.c +++ b/screen.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: screen.c,v 1.55 2014/01/27 15:13:09 okan Exp $ + * $OpenBSD: screen.c,v 1.56 2014/02/02 16:13:50 okan Exp $ */ #include @@ -65,7 +65,6 @@ screen_init(int which) /* Deal with existing clients. */ XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins); - for (i = 0; i < nwins; i++) { XGetWindowAttributes(X_Dpy, wins[i], &winattr); if (winattr.override_redirect || @@ -73,7 +72,8 @@ screen_init(int which) continue; (void)client_init(wins[i], sc, winattr.map_state != IsUnmapped); } - XFree(wins); + if (wins) + XFree(wins); screen_updatestackingorder(sc); -- cgit v1.2.3-2-gb3c3