3789. [bug] Null pointer dereference on rbt creation failure.

diff --git a/CHANGES b/CHANGES
index 6d2599bd6638097014b7f922bd700b4f4dd1b01b..e9109cb936d9cdd61681876d08f3174004633c6a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3789.  [bug]           Null pointer dereference on rbt creation failure.
+
 3788.  [bug]           dns_peer_getrequestsit was returning request_nsid by
                        mistake.
 

diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index e1421f826d1e91ecc65779940fa1eef3ded3ecc8..4e3b51fd1645f66c28336478edaa8a95759c1d50 100644 (file)
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -865,7 +865,7 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize,
                result = ISC_R_INVALIDFILE;
 
  cleanup:
-       if (result != ISC_R_SUCCESS) {
+       if (result != ISC_R_SUCCESS && rbt != NULL) {
                rbt->root = NULL;
                rbt->nodecount = 0;
                dns_rbt_destroy(&rbt);