fixed segfault with monitor detection

[chaz/tint2] / src / server.c

diff --git a/src/server.c b/src/server.c
index 20e8095df15a90a3f875f9c3b47e47a9bc83304f..db50445133a71426af8039df174c7121ba0bc747 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -104,7 +104,8 @@ void cleanup_server()
        if (server.monitor) {
                int i;
                for (i=0; i<server.nb_monitor; ++i)
-                       g_strfreev(server.monitor[i].names);
+                       if (server.monitor[i].names)
+                               g_strfreev(server.monitor[i].names);
                free(server.monitor);
        }
        if (server.gc) XFreeGC(server.dsp, server.gc);
@@ -247,21 +248,12 @@ int compareMonitorIncluded(const void *monitor1, const void *monitor2)
 
 void get_monitors()
 {
-       if (server.monitor) {
-               int i;
-               for (i=0; i<server.nb_monitor; ++i)
-                       g_strfreev(server.monitor[i].names);
-               free(server.monitor);
-       }
-       server.nb_monitor = 0;
-       server.monitor = 0;
-
        int i, j, nbmonitor;
        if (XineramaIsActive(server.dsp)) {
                XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nbmonitor);
                XRRScreenResources *res = XRRGetScreenResourcesCurrent(server.dsp, server.root_win);
 
-               if (res->ncrtc >= nbmonitor) {
+               if (res && res->ncrtc >= nbmonitor) {
                        // use xrandr to identify monitors (does not work with proprietery nvidia drivers)
                        printf("xRandr: Found crtc's: %d\n", res->ncrtc );
                        server.monitor = malloc(res->ncrtc * sizeof(Monitor));
@@ -309,12 +301,14 @@ void get_monitors()
                }
 next:
                for (j=i; j<server.nb_monitor; ++j)
-                       g_strfreev(server.monitor[j].names);
+                       if (server.monitor[j].names)
+                               g_strfreev(server.monitor[j].names);
                server.nb_monitor = i;
                server.monitor = realloc(server.monitor, server.nb_monitor * sizeof(Monitor));
                qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitorPos);
 
-               XRRFreeScreenResources(res);
+               if (res)
+                       XRRFreeScreenResources(res);
                XFree(info);
        }
 
@@ -324,6 +318,7 @@ next:
                server.monitor[0].x = server.monitor[0].y = 0;
                server.monitor[0].width = DisplayWidth (server.dsp, server.screen);
                server.monitor[0].height = DisplayHeight (server.dsp, server.screen);
+               server.monitor[0].names = 0;
        }
 }