mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

pass rng to destroy

Browse Source
This commit is contained in:
Mark Andrews
2014-06-11 22:57:46 +10:00
parent 0c57bf16a5
commit 23fe5cbb07
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/dns/rdata/generic/hip_55.c
View File

@@ -318,6 +318,8 @@ tostruct_hip(ARGS_TOSTRUCT) {
goto cleanup; goto cleanup;
isc_region_consume(&region, hip->hit_len); isc_region_consume(&region, hip->hit_len);
INSIST(hip->key_len <= region.length);
hip->key = mem_maybedup(mctx, region.base, hip->key_len); hip->key = mem_maybedup(mctx, region.base, hip->key_len);
if (hip->key == NULL) if (hip->key == NULL)
goto cleanup; goto cleanup;

8
lib/isc/random.c
View File

@@ -243,15 +243,13 @@ isc_rng_attach(isc_rng_t *source, isc_rng_t **targetp) {
} }
static void static void
destroy(isc_rng_t **rngp) { destroy(isc_rng_t *rng) {
isc_rng_t *rng = *rngp;
REQUIRE(VALID_RNG(rng)); REQUIRE(VALID_RNG(rng));
isc_mutex_destroy(&rng->lock);
rng->magic = 0; rng->magic = 0;
isc_mutex_destroy(&rng->lock);
isc_mem_putanddetach(&rng->mctx, rng, sizeof(isc_rng_t)); isc_mem_putanddetach(&rng->mctx, rng, sizeof(isc_rng_t));
*rngp = NULL;
} }
void void
@@ -273,7 +271,7 @@ isc_rng_detach(isc_rng_t **rngp) {
UNLOCK(&rng->lock); UNLOCK(&rng->lock);
if (dest) if (dest)
destroy(rngp); destroy(rng);
} }
static void static void