X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Ftable.c;h=eb18660cb82a7732a8c52af58d9a6b40f63b3a39;hp=082914a3579f095141f28c1a1e973d9f1a952c32;hb=6d63f6e9834c838e0a6469d9eaf17feffa3b2959;hpb=1e021c689d6f316ec208443060a36b9638a0840a

diff --git a/src/table.c b/src/table.c
index 082914a3..eb18660c 100644
--- a/src/table.c
+++ b/src/table.c
@@ -77,6 +77,10 @@ static void tbl_result_setup(tbl_result_t *res) {
 } /* tbl_result_setup */
 
 static void tbl_result_clear(tbl_result_t *res) {
+  if (res == NULL) {
+    return;
+  }
+
   sfree(res->type);
 
   sfree(res->instance_prefix);
@@ -101,10 +105,16 @@ static void tbl_setup(tbl_t *tbl, char *file) {
 } /* tbl_setup */
 
 static void tbl_clear(tbl_t *tbl) {
+  if (tbl == NULL) {
+    return;
+  }
+
   sfree(tbl->file);
   sfree(tbl->sep);
   sfree(tbl->instance);
 
+  /* (tbl->results == NULL) -> (tbl->results_num == 0) */
+  assert((tbl->results != NULL) || (tbl->results_num == 0));
   for (size_t i = 0; i < tbl->results_num; ++i)
     tbl_result_clear(tbl->results + i);
   sfree(tbl->results);