From: Kavanagh, Mark B <mark.b.kavanagh@intel.com>
Date: Mon, 26 Feb 2018 16:12:26 +0000 (+0000)
Subject: utils_ovs: fix potential NULL-string dereference
X-Git-Tag: collectd-5.9.0~310^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3617d45b787a4856359740717bb6936c98a241a;p=thirdparty%2Fcollectd.git

utils_ovs: fix potential NULL-string dereference

In ovs_utils_get_map_value(), a potential NULL-string, returned
by YAJL_GET_STRING(), is passed to strcmp, and subsequently
dereferenced. Ensure that said string is non-NULL.

Fixes: cb59d85 ("ovs_events: Fix plugin collectd config file")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>
---

diff --git a/src/utils_ovs.c b/src/utils_ovs.c
index a081fa952..650a64c7e 100644
--- a/src/utils_ovs.c
+++ b/src/utils_ovs.c
@@ -1387,7 +1387,7 @@ yajl_val ovs_utils_get_map_value(yajl_val jval, const char *key) {
 
     /* return map value if given key equals map key */
     str_val = YAJL_GET_STRING(array_values[0]);
-    if (strcmp(key, str_val) == 0)
+    if (str_val != NULL && strcmp(key, str_val) == 0)
       return array_values[1];
   }
   return NULL;