qdisc: avoid calling strstr() with a NULL haystack

Signed-off-by: Thomas Haller <thaller@redhat.com>
thom311 · Aug 27, 2014 · a640e97 · a640e97
1 parent 54ae1d9
commit a640e97
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/lib/cli/qdisc/hfsc.c b/lib/cli/qdisc/hfsc.c
@@ -81,12 +81,13 @@ hfsc_get_sc(char *optarg, struct tc_service_curve *sc)
 {
 	unsigned int m1 = 0, d = 0, m2 = 0;
 	char *tmp = strdup(optarg);
-	char *p = tmp, *endptr;
+	char *p, *endptr;
+	char *pp = tmp;
 
 	if (!tmp)
 		return -ENOMEM;
 
-	p = strstr(p, "m1:");
+	p = strstr(pp, "m1:");
 	if (p) {
 		char *q;
 		p += 3;
@@ -99,10 +100,10 @@ hfsc_get_sc(char *optarg, struct tc_service_curve *sc)
 		m1 = strtoul(p, &endptr, 10);
 		if (endptr == p)
 			goto err;
-		p = q + 1;
-        }
+		pp = q + 1;
+	}
 
-	p = strstr(p, "d:");
+	p = strstr(pp, "d:");
 	if (p) {
 		char *q;
 		p += 2;
@@ -115,18 +116,18 @@ hfsc_get_sc(char *optarg, struct tc_service_curve *sc)
 		d = strtoul(p, &endptr, 10);
 		if (endptr == p)
 			goto err;
-		p = q + 1;
-        }
+		pp = q + 1;
+	}
 
-	p = strstr(p, "m2:");
+	p = strstr(pp, "m2:");
 	if (p) {
 		p += 3;
 		if (*p == 0)
 			goto err;
 		m2 = strtoul(p, &endptr, 10);
 		if (endptr == p)
 			goto err;
-        } else
+	} else
 		goto err;
 
 	free(tmp);