diff options
| author | Thomas Markwalder <tmark@isc.org> | 2016-09-27 15:10:23 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2016-09-27 15:10:23 -0400 |
| commit | 15da3515b4bf2de437253fc3fcfdd3672c729c42 (patch) | |
| tree | 8f196a301cc6839e9d616b099ebbf9a197e4ee59 | |
| parent | 1ab24549e011ce49fe572d4a338c1a8f0f30ffee (diff) | |
| download | isc-dhcp-15da3515b4bf2de437253fc3fcfdd3672c729c42.tar.gz | |
[v4_3] Added null check to eliminate call to dfree in lc_delete_all
Merges in rt43262.
| -rw-r--r-- | RELNOTES | 6 | ||||
| -rw-r--r-- | server/leasechain.c | 7 |
2 files changed, 11 insertions, 2 deletions
@@ -59,6 +59,12 @@ by Eric Young (eay@cryptsoft.com). to Jay Ford, University of Iowa for reporting the issue. [ISC-Bugs #43185] +- 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.4 - Fixed util/bindvar.sh error handling. diff --git a/server/leasechain.c b/server/leasechain.c index bf6a2bf9..11310a92 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; } |