stv0g/libnl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

qdisc: avoid calling strstr() with a NULL haystack

Browse source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Nicolas PLANEL 2014-08-26 11:21:12 -04:00 • committed by Thomas Haller
parent 54ae1d95a4
commit a640e97a22
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/cli/qdisc/hfsc.c
View file

@ -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,10 +116,10 @@ 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)
@ -126,7 +127,7 @@ hfsc_get_sc(char *optarg, struct tc_service_curve *sc)
m2 = strtoul(p, &endptr, 10);
if (endptr == p)
goto err;
} else
} else
goto err;
free(tmp);