mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Use isc_mem_get(0) rather than NULL pointers in regions

Browse Source
This commit is contained in:
Brian Wellington 2000-03-17 19:50:22 +00:00
parent 9b5be7076f
commit 21fbf56571
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/dns/tkey.c
View File

@ -16,7 +16,7 @@
*/ */
/* /*
* $Id: tkey.c,v 1.24 2000/03/08 20:15:16 bwelling Exp $ * $Id: tkey.c,v 1.25 2000/03/17 19:50:22 bwelling Exp $
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
*/ */
@ -751,7 +751,7 @@ dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, dns_name_t *name,
if (nonce != NULL) if (nonce != NULL)
isc_buffer_region(nonce, &r); isc_buffer_region(nonce, &r);
else { else {
r.base = NULL; r.base = isc_mem_get(msg->mctx, 0);
r.length = 0; r.length = 0;
} }
tkey.error = 0; tkey.error = 0;
@ -762,6 +762,9 @@ dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, dns_name_t *name,
RETERR(buildquery(msg, name, &tkey)); RETERR(buildquery(msg, name, &tkey));
if (nonce == NULL)
isc_mem_put(msg->mctx, r.base, 0);
RETERR(dns_message_gettemprdata(msg, &rdata)); RETERR(dns_message_gettemprdata(msg, &rdata));
RETERR(isc_buffer_allocate(msg->mctx, &dynbuf, 1024, RETERR(isc_buffer_allocate(msg->mctx, &dynbuf, 1024,
ISC_BUFFERTYPE_BINARY)); ISC_BUFFERTYPE_BINARY));
@ -945,10 +948,12 @@ dns_tkey_processdhresponse(dns_message_t *qmsg, dns_message_t *rmsg,
if (nonce != NULL) if (nonce != NULL)
isc_buffer_region(nonce, &r2); isc_buffer_region(nonce, &r2);
else { else {
r2.base = NULL; r2.base = isc_mem_get(rmsg->mctx, 0);
r2.length = 0; r2.length = 0;
} }
RETERR(compute_secret(shared, &r2, &r, &secret)); RETERR(compute_secret(shared, &r2, &r, &secret));
if (nonce == NULL)
isc_mem_put(rmsg->mctx, r2.base, 0);
isc_buffer_used(&secret, &r); isc_buffer_used(&secret, &r);
tsigkey = NULL; tsigkey = NULL;