From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 4 Dec 2015 20:18:27 +0000 (+0100)
Subject: utils_mount.c: check for null before dereferencing
X-Git-Tag: collectd-5.5.1~33
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=971a8827d1af8a7be03269d9117dcb5f2e7f89f3;p=collectd.git

utils_mount.c: check for null before dereferencing

CID #38025

Signed-off-by: Florian Forster <octo@collectd.org>
---

diff --git a/src/utils_mount.c b/src/utils_mount.c
index afeb39e1..f2b79439 100644
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@ -760,13 +760,13 @@ void cu_mount_freelist (cu_mount_t *list)
 char *
 cu_mount_checkoption(char *line, char *keyword, int full)
 {
-	char *line2, *l2;
-	int l = strlen(keyword);
-	char *p1, *p2;
+	char *line2, *l2, *p1, *p2;
+	int l;
 
 	if(line == NULL || keyword == NULL) {
 		return NULL;
 	}
+
 	if(full != 0) {
 		full = 1;
 	}
@@ -780,6 +780,7 @@ cu_mount_checkoption(char *line, char *keyword, int full)
 		l2++;
 	}
 
+	l = strlen(keyword);
 	p1 = line - 1;
 	p2 = strchr(line, ',');
 	do {