Silence "Access to field 'refs' results in a dereference of a null pointer" by adding...

diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index f46776834465e076d98e36377e7f8a3df6aa054d..9997c0697fbeb807748ad81f95be4a662571e1c7 100644 (file)
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -411,6 +411,10 @@ cfg_obj_destroy(cfg_parser_t *pctx, cfg_obj_t **obj);
 /*%<
  * Delete a reference to a configuration object; destroy the object if
  * there are no more references.
+ *
+ * Require:
+ * \li     '*obj' is a valid cfg_obj_t.
+ * \li     'pctx' is a valid cfg_parser_t.
  */
 
 void

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index ef20184f397550c384de771e0f402e5002ee4a36..b56b0d59b61c2dec0297e7c0cb6bcc54f6ea56de 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -2426,9 +2426,14 @@ cfg_obj_istype(const cfg_obj_t *obj, const cfg_type_t *type) {
  */
 void
 cfg_obj_destroy(cfg_parser_t *pctx, cfg_obj_t **objp) {
-       cfg_obj_t *obj = *objp;
+       cfg_obj_t *obj;
        unsigned int refs;
 
+       REQUIRE(objp != NULL && *objp != NULL);
+       REQUIRE(pctx != NULL);
+
+       obj = *objp;
+       
        isc_refcount_decrement(&obj->references, &refs);
        if (refs == 0) {
                obj->type->rep->free(pctx, obj);