print_config: check if resource it used at all

prevents a segfault on director, when running with debug >= 900 Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>
bareos · Sep 26, 2014 · e4d36a1 · e4d36a1
1 parent 432830f
commit e4d36a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/lib/parse_conf.h b/src/lib/parse_conf.h
@@ -116,8 +116,8 @@ class RES {
    char *name;                          /* resource name */
    char *desc;                          /* resource description */
    uint32_t rcode;                      /* resource id or type */
-   int32_t  refcnt;                     /* reference count for releasing */
-   char  item_present[MAX_RES_ITEMS];   /* set if item is present in conf file */
+   int32_t refcnt;                      /* reference count for releasing */
+   char item_present[MAX_RES_ITEMS];    /* set if item is present in conf file */
 };
 
 /*

diff --git a/src/lib/res.c b/src/lib/res.c
@@ -1398,6 +1398,14 @@ bool BRSRES::print_config(POOL_MEM &buff)
    int i = 0;
    int rindex = this->hdr.rcode - my_config->m_r_first;
 
+   /*
+    * If entry is not used, then there is nothing to print.
+    */
+   if (this->hdr.rcode < my_config->m_r_first ||
+       this->hdr.refcnt <= 0) {
+      return true;
+   }
+
    /*
     * Make sure the resource class has any items.
     */