mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Andrews
2013-01-17 14:38:28 +11:00
parent d710475e18
commit d8e8abdff9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/isccfg/include/isccfg/cfg.h
View File

@@ -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 * Delete a reference to a configuration object; destroy the object if
* there are no more references. * there are no more references.
*
* Require:
* \li '*obj' is a valid cfg_obj_t.
* \li 'pctx' is a valid cfg_parser_t.
*/ */
void void

7
lib/isccfg/parser.c
View File

@@ -2426,9 +2426,14 @@ cfg_obj_istype(const cfg_obj_t *obj, const cfg_type_t *type) {
*/ */
void void
cfg_obj_destroy(cfg_parser_t *pctx, cfg_obj_t **objp) { cfg_obj_destroy(cfg_parser_t *pctx, cfg_obj_t **objp) {
cfg_obj_t *obj = *objp; cfg_obj_t *obj;
unsigned int refs; unsigned int refs;
REQUIRE(objp != NULL && *objp != NULL);
REQUIRE(pctx != NULL);
obj = *objp;
isc_refcount_decrement(&obj->references, &refs); isc_refcount_decrement(&obj->references, &refs);
if (refs == 0) { if (refs == 0) {
obj->type->rep->free(pctx, obj); obj->type->rep->free(pctx, obj);