From c9d019339f9ecc99c698bf186e53d5b72b951c27 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 16 Aug 2016 07:09:45 +0200 Subject: [PATCH] ceph plugin: Assert that the strings on the stack are non-NULL. The static analyzer is whining about passing NULLs to strcmp(). --- src/ceph.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ceph.c b/src/ceph.c index 458112ae..e6d3767b 100644 --- a/src/ceph.c +++ b/src/ceph.c @@ -297,6 +297,11 @@ ceph_cb_number(void *ctx, const char *number_val, yajl_len_t number_len) { latency_type = 1; + /* depth >= 2 => (stack[-1] != NULL && stack[-2] != NULL) */ + assert ((state->depth < 2) + || ((state->stack[state->depth - 1] != NULL) + && (state->stack[state->depth - 2] != NULL))); + /* Super-special case for filestore.journal_wr_bytes.avgcount: For * some reason, Ceph schema encodes this as a count/sum pair while all * other "Bytes" data (excluding used/capacity bytes for OSD space) uses -- 2.11.0