mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

pullup:

Browse Source 
res_init()/res_ninit() could leak memory when re-called.
This commit is contained in:
Mark Andrews
2005-09-09 00:33:22 +00:00
parent cf0bcc2c80
commit 475c811bfd
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/bind/resolv/res_init.c
View File

@@ -70,7 +70,7 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
static const char rcsid[] = "$Id: res_init.c,v 1.18 2005/07/28 06:51:51 marka Exp $"; static const char rcsid[] = "$Id: res_init.c,v 1.19 2005/09/09 00:33:22 marka Exp $";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include "port_before.h" #include "port_before.h"
@@ -167,6 +167,9 @@ __res_vinit(res_state statp, int preinit) {
int dots; int dots;
union res_sockaddr_union u[2]; union res_sockaddr_union u[2];
if (statp->_u._ext.ext != NULL)
res_ndestroy(statp);
if (!preinit) { if (!preinit) {
statp->retrans = RES_TIMEOUT; statp->retrans = RES_TIMEOUT;
statp->retry = RES_DFLRETRY; statp->retry = RES_DFLRETRY;
@@ -174,9 +177,6 @@ __res_vinit(res_state statp, int preinit) {
statp->id = res_randomid(); statp->id = res_randomid();
} }
if ((statp->options & RES_INIT) != 0U)
res_ndestroy(statp);
memset(u, 0, sizeof(u)); memset(u, 0, sizeof(u));
#ifdef USELOOPBACK #ifdef USELOOPBACK
u[nserv].sin.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1); u[nserv].sin.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
@@ -240,12 +240,12 @@ __res_vinit(res_state statp, int preinit) {
if (strlcpy(statp->defdname, buf, if (strlcpy(statp->defdname, buf,
sizeof(statp->defdname)) sizeof(statp->defdname))
>= sizeof(statp->defdname)) >= sizeof(statp->defdname))
return (-1); goto freedata;
} else { } else {
if (strlcpy(statp->defdname, cp+1, if (strlcpy(statp->defdname, cp+1,
sizeof(statp->defdname)) sizeof(statp->defdname))
>= sizeof(statp->defdname)) >= sizeof(statp->defdname))
return (-1); goto freedata;
} }
} }
} }
@@ -489,6 +489,15 @@ __res_vinit(res_state statp, int preinit) {
res_setoptions(statp, cp, "env"); res_setoptions(statp, cp, "env");
statp->options |= RES_INIT; statp->options |= RES_INIT;
return (0); return (0);
#ifdef SOLARIS2
freedata:
if (statp->_u._ext.ext != NULL) {
free(statp->_u._ext.ext);
statp->_u._ext.ext = NULL;
}
return (-1);
#endif
} }
static void static void