Crash less if no EDID block found in log file.

edid-decode.c

@@ -139,6 +139,10 @@ extract_edid(int fd)
 {
     struct stat buf;
     unsigned char *ret1 = NULL, *ret2 = NULL;
+    unsigned char *start, *end, *c;
+    unsigned char *out = NULL;
+    int state = 0;
+    int lines = 0;
     int i;
 
     if (fstat(fd, &buf))
@@ -157,12 +161,11 @@ extract_edid(int fd)
     }
 
     /* I think it is, let's go scanning */
-    unsigned char *start, *end, *c;
-    unsigned char *out = NULL;
-    int state = 0;
-    int lines = 0;
-    start = strstr(strstr(ret1, "EDID (in hex):"), "(II)");
-    end = strstr(start, ": \n");
+    if (!(start = strstr(strstr(ret1, "EDID (in hex):"), "(II)")))
+	return ret1;
+    if (!(end = strstr(start, ": \n")))
+	return ret1;
+
     for (c = start; c < end; c++) {
 	if (state == 0) {
 	    /* skip ahead to the : */