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

[master] fix memory leak

Browse Source
This commit is contained in:
Evan Hunt
2014-03-04 08:56:09 -08:00
parent e69790ac00
commit f6d0284ec2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/dns/resolver.c
View File

@@ -6935,14 +6935,15 @@ log_nsid(isc_buffer_t *opt, size_t nsid_len, resquery_t *query,
static const char hex[17] = "0123456789abcdef"; static const char hex[17] = "0123456789abcdef";
char addrbuf[ISC_SOCKADDR_FORMATSIZE]; char addrbuf[ISC_SOCKADDR_FORMATSIZE];
isc_uint16_t buflen, i; isc_uint16_t buflen, i;
unsigned char *p, *buf, *pbuf, *nsid; unsigned char *p, *nsid;
unsigned char *buf = NULL, *pbuf = NULL;
/* Allocate buffer for storing hex version of the NSID */ /* Allocate buffer for storing hex version of the NSID */
buflen = (isc_uint16_t)nsid_len * 2 + 1; buflen = (isc_uint16_t)nsid_len * 2 + 1;
buf = isc_mem_get(mctx, buflen); buf = isc_mem_get(mctx, buflen);
if (buf == NULL) if (buf == NULL)
return; goto cleanup;
pbuf = isc_mem_get(mctx, nsid_len); pbuf = isc_mem_get(mctx, nsid_len + 1);
if (pbuf == NULL) if (pbuf == NULL)
goto cleanup; goto cleanup;
@@ -6971,7 +6972,10 @@ log_nsid(isc_buffer_t *opt, size_t nsid_len, resquery_t *query,
DNS_LOGMODULE_RESOLVER, level, DNS_LOGMODULE_RESOLVER, level,
"received NSID %s (\"%s\") from %s", buf, pbuf, addrbuf); "received NSID %s (\"%s\") from %s", buf, pbuf, addrbuf);
cleanup: cleanup:
isc_mem_put(mctx, buf, buflen); if (pbuf != NULL)
isc_mem_put(mctx, pbuf, nsid_len + 1);
if (buf != NULL)
isc_mem_put(mctx, buf, buflen);
} }
static isc_boolean_t static isc_boolean_t