d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't free(9) a pointer which has been modified.

Browse Source 
Chapeau de pointe:	mux
This commit is contained in:
phk 2002-04-23 18:52:39 +00:00
parent 834fdde07a
commit 6a45f19d90
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/amd64/amd64/autoconf.c
View File

@ -290,31 +290,32 @@ hwaddr_to_sockaddr(char *ev, struct sockaddr_dl *sa)
static int
decode_nfshandle(char *ev, u_char *fh)
{
u_char *cp;
u_char *cp, *ep;
int len, val;
if ((cp = getenv(ev)) == NULL)
ep = cp = getenv(ev);
if (cp == NULL)
return(0);
if ((strlen(cp) < 2) || (*cp != 'X')) {
freeenv(cp);
freeenv(ep);
return (0);
}
len = 0;
cp++;
for (;;) {
if (*cp == 'X') {
freeenv(cp);
freeenv(ep);
return(len);
}
if ((sscanf(cp, "%2x", &val) != 1) || (val > 0xff)) {
freeenv(cp);
freeenv(ep);
return(0);
}
*(fh++) = val;
len++;
cp += 2;
if (len > NFSX_V2FH) {
freeenv(cp);
freeenv(ep);
return(0);
}
}

13
sys/i386/i386/autoconf.c
View File

@ -290,31 +290,32 @@ hwaddr_to_sockaddr(char *ev, struct sockaddr_dl *sa)
static int
decode_nfshandle(char *ev, u_char *fh)
{
u_char *cp;
u_char *cp, *ep;
int len, val;
if ((cp = getenv(ev)) == NULL)
ep = cp = getenv(ev);
if (cp == NULL)
return(0);
if ((strlen(cp) < 2) || (*cp != 'X')) {
freeenv(cp);
freeenv(ep);
return (0);
}
len = 0;
cp++;
for (;;) {
if (*cp == 'X') {
freeenv(cp);
freeenv(ep);
return(len);
}
if ((sscanf(cp, "%2x", &val) != 1) || (val > 0xff)) {
freeenv(cp);
freeenv(ep);
return(0);
}
*(fh++) = val;
len++;
cp += 2;
if (len > NFSX_V2FH) {
freeenv(cp);
freeenv(ep);
return(0);
}
}