52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
|
commit 959b2001458bca8f9228014371aad6ccbeb95a68
|
||
|
|
Author: Zhi Li <yieli@redhat.com>
|
||
|
|
Date: Wed Sep 26 14:05:29 2018 -0400
|
||
|
|
|
||
|
|
getnetconfig.c: fix a BAD_FREE (CWE-763)
|
||
|
|
|
||
|
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||
|
|
|
||
|
|
diff --git a/src/getnetconfig.c b/src/getnetconfig.c
|
||
|
|
index d67d97d..cfd33c2 100644
|
||
|
|
--- a/src/getnetconfig.c
|
||
|
|
+++ b/src/getnetconfig.c
|
||
|
|
@@ -681,6 +681,7 @@ struct netconfig *ncp;
|
||
|
|
{
|
||
|
|
struct netconfig *p;
|
||
|
|
char *tmp;
|
||
|
|
+ char *t;
|
||
|
|
u_int i;
|
||
|
|
|
||
|
|
if ((tmp=malloc(MAXNETCONFIGLINE)) == NULL)
|
||
|
|
@@ -700,22 +701,21 @@ struct netconfig *ncp;
|
||
|
|
*/
|
||
|
|
*p = *ncp;
|
||
|
|
p->nc_netid = (char *)strcpy(tmp,ncp->nc_netid);
|
||
|
|
- tmp = strchr(tmp, 0) + 1;
|
||
|
|
- p->nc_protofmly = (char *)strcpy(tmp,ncp->nc_protofmly);
|
||
|
|
- tmp = strchr(tmp, 0) + 1;
|
||
|
|
- p->nc_proto = (char *)strcpy(tmp,ncp->nc_proto);
|
||
|
|
- tmp = strchr(tmp, 0) + 1;
|
||
|
|
- p->nc_device = (char *)strcpy(tmp,ncp->nc_device);
|
||
|
|
+ t = strchr(tmp, 0) + 1;
|
||
|
|
+ p->nc_protofmly = (char *)strcpy(t,ncp->nc_protofmly);
|
||
|
|
+ t = strchr(t, 0) + 1;
|
||
|
|
+ p->nc_proto = (char *)strcpy(t,ncp->nc_proto);
|
||
|
|
+ t = strchr(t, 0) + 1;
|
||
|
|
+ p->nc_device = (char *)strcpy(t,ncp->nc_device);
|
||
|
|
p->nc_lookups = (char **)malloc((size_t)(p->nc_nlookups+1) * sizeof(char *));
|
||
|
|
if (p->nc_lookups == NULL) {
|
||
|
|
- free(p->nc_netid);
|
||
|
|
free(p);
|
||
|
|
free(tmp);
|
||
|
|
return(NULL);
|
||
|
|
}
|
||
|
|
for (i=0; i < p->nc_nlookups; i++) {
|
||
|
|
- tmp = strchr(tmp, 0) + 1;
|
||
|
|
- p->nc_lookups[i] = (char *)strcpy(tmp,ncp->nc_lookups[i]);
|
||
|
|
+ t = strchr(t, 0) + 1;
|
||
|
|
+ p->nc_lookups[i] = (char *)strcpy(t,ncp->nc_lookups[i]);
|
||
|
|
}
|
||
|
|
return(p);
|
||
|
|
}
|