From: Thierry Lorthiois <lorthiois@bbsoft.fr>
Date: Tue, 8 Jun 2010 15:56:04 +0000 (+0000)
Subject: fixed segfault with monitor detection
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;ds=sidebyside;h=106a3423e2a034da08b6f12c87b42b9a99fb34af;hp=fed047d774c4523775beec25466aadd25fc2e7a4;p=chaz%2Ftint2

fixed segfault with monitor detection
---

diff --git a/src/config.c b/src/config.c
index 61178d1..6233ecc 100644
--- a/src/config.c
+++ b/src/config.c
@@ -155,9 +155,7 @@ int get_task_status(char* status)
 
 int config_get_monitor(char* monitor)
 {
-	if (strcmp(monitor, "all") == 0)
-		return -1;
-	else {
+	if (strcmp(monitor, "all") != 0) {
 		char* endptr;
 		int ret_int = strtol(monitor, &endptr, 10);
 		if (*endptr == 0)
@@ -166,6 +164,9 @@ int config_get_monitor(char* monitor)
 			// monitor specified by name, not by index
 			int i, j;
 			for (i=0; i<server.nb_monitor; ++i) {
+				if (server.monitor[i].names == 0) 
+					// xrandr can't identify monitors
+					continue;
 				j = 0;
 				while (server.monitor[i].names[j] != 0) {
 					if (strcmp(monitor, server.monitor[i].names[j++]) == 0)
@@ -174,6 +175,7 @@ int config_get_monitor(char* monitor)
 			}
 		}
 	}
+	// monitor == "all" or monitor not found or xrandr can't identify monitors
 	return -1;
 }
 
diff --git a/src/server.c b/src/server.c
index d30b109..db50445 100644
--- a/src/server.c
+++ b/src/server.c
@@ -253,7 +253,7 @@ void get_monitors()
 		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));
@@ -307,7 +307,8 @@ next:
 		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);
 	}