denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pluto: Fixed potential memory leak in atoaddr.

Browse Source
This commit is contained in:
Tobias Brunner
2011-04-14 18:11:45 +02:00
parent 862ef49f85
commit 6045eaa54a
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libfreeswan/atoaddr.c
+15 -9
View File
@@ -45,7 +45,7 @@ struct in_addr *addrp;
{ {
struct addrinfo hints, *res; struct addrinfo hints, *res;
struct netent *ne = NULL; struct netent *ne = NULL;
const char *oops; const char *oops, *msg = NULL;
# define HEXLEN 10 /* strlen("0x11223344") */ # define HEXLEN 10 /* strlen("0x11223344") */
# ifndef ATOADDRBUF # ifndef ATOADDRBUF
# define ATOADDRBUF 100 # define ATOADDRBUF 100
@@ -84,10 +84,18 @@ struct in_addr *addrp;
/* next, check that it's a vaguely legal name */ /* next, check that it's a vaguely legal name */
for (q = p; *q != '\0'; q++) for (q = p; *q != '\0'; q++)
{
if (!isprint(*q)) if (!isprint(*q))
return "unprintable character in name"; {
msg = "unprintable character in name";
goto error;
}
}
if (strspn(p, namechars) != srclen) if (strspn(p, namechars) != srclen)
return "illegal (non-DNS-name) character in name"; {
msg = "illegal (non-DNS-name) character in name";
goto error;
}
/* try as host name, failing that as /etc/networks network name */ /* try as host name, failing that as /etc/networks network name */
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
@@ -98,11 +106,8 @@ struct in_addr *addrp;
ne = getnetbyname(p); ne = getnetbyname(p);
if (ne == NULL) if (ne == NULL)
{ {
if (p != namebuf) msg = "name lookup failed";
{ goto error;
FREE(p);
}
return "name lookup failed";
} }
addrp->s_addr = htonl(ne->n_net); addrp->s_addr = htonl(ne->n_net);
} }
@@ -113,12 +118,13 @@ struct in_addr *addrp;
freeaddrinfo(res); freeaddrinfo(res);
} }
error:
if (p != namebuf) if (p != namebuf)
{ {
FREE(p); FREE(p);
} }
return NULL; return msg;
} }
/* /*