projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1e021c6
)
table plugin: Add explicit NULL checks to clear functions.
author
Florian Forster
<octo@collectd.org>
Mon, 4 Dec 2017 07:18:33 +0000
(08:18 +0100)
committer
Florian Forster
<octo@collectd.org>
Mon, 4 Dec 2017 07:18:33 +0000
(08:18 +0100)
CID: 37966
src/table.c
patch
|
blob
|
history
diff --git
a/src/table.c
b/src/table.c
index
082914a
..
eb18660
100644
(file)
--- 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) {
} /* tbl_result_setup */
static void tbl_result_clear(tbl_result_t *res) {
+ if (res == NULL) {
+ return;
+ }
+
sfree(res->type);
sfree(res->instance_prefix);
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) {
} /* tbl_setup */
static void tbl_clear(tbl_t *tbl) {
+ if (tbl == NULL) {
+ return;
+ }
+
sfree(tbl->file);
sfree(tbl->sep);
sfree(tbl->instance);
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);
for (size_t i = 0; i < tbl->results_num; ++i)
tbl_result_clear(tbl->results + i);
sfree(tbl->results);