Defensive coding for the presence of NULs.

andersson · Mar 30, 2015 · ecb7e1f · ecb7e1f
1 parent bc6f155
commit ecb7e1f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/gpsd.c b/gpsd.c
@@ -988,13 +988,13 @@ static void set_serial(struct gps_device_t *device,
 
     while (isspace((unsigned char) *modestring))
 	modestring++;
-    if (strchr("78", *modestring) != NULL) {
+    if (*modestring && strchr("78", *modestring) != NULL) {
 	wordsize = (int)(*modestring++ - '0');
-	if (strchr("NOE", *modestring) != NULL) {
+	if (*modestring && strchr("NOE", *modestring) != NULL) {
 	    parity = *modestring++;
 	    while (isspace((unsigned char) *modestring))
 		modestring++;
-	    if (strchr("12", *modestring) != NULL)
+	    if (*modestring && strchr("12", *modestring) != NULL)
 		stopbits = (unsigned int)(*modestring - '0');
 	}
     }