From 72261e818b675b869ce29b190c3105f356857757 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Tue, 27 Sep 2016 14:59:08 -0400 Subject: [PATCH] [master] Added null check to eliminate call to dfree in lc_delete_all Merges in rt43262. --- RELNOTES | 6 ++++++ server/leasechain.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/RELNOTES b/RELNOTES index f02df24b6..e4d6eb883 100644 --- a/RELNOTES +++ b/RELNOTES @@ -88,6 +88,12 @@ by Eric Young (eay@cryptsoft.com). either "no" or an (absolute) path, i.e. "yes" is no longer valid. [ISC-Bugs #43227] +- Eliminated a noisy, but otherwise harmless debug log statment that may + appear during server startup when building with --enable-binary-leases + and configuring multiple pools in a shared network. Thanks to Fernando + Soto from BlueCat Networks for reporting the issue and supplying a patch. + [ISC-Bugs #43262] + Changes since 4.3.0 (bug fixes) - Tidy up several small tickets. diff --git a/server/leasechain.c b/server/leasechain.c index bf6a2bf94..11310a922 100644 --- a/server/leasechain.c +++ b/server/leasechain.c @@ -670,8 +670,11 @@ lc_delete_all(struct leasechain *lc) { } /* and then get rid of the list itself */ - dfree(lc->list, MDL); - lc->list = NULL; + if (lc->list != NULL) { + dfree(lc->list, MDL); + lc->list = NULL; + } + lc->total = 0; lc->nelem = 0; } -- 2.47.3