From: Ivana Hutarova Varekova <varekova@redhat.com>
Date: Wed, 9 Oct 2013 09:41:22 +0000 (+0200)
Subject: cgroup_get_current_controller_path: test whether strtok_r returns NULL
X-Git-Tag: v0.41~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cde0c548d63abc758e9ba6520efe0d17e1267206;p=thirdparty%2Flibcgroup.git

cgroup_get_current_controller_path: test whether strtok_r returns NULL

cgroup_get_current_controller_path  should test whether strtok_r returns NULL before it continues.


Signed-off-by: Ivana Hutarova Varekova <varekova@redhat.com>
Acked-by: Peter Schiffer <pschiffe@redhat.com>
Acked-by: Dhaval Giani <dhaval.giani@gmail.com>
---

diff --git a/src/api.c b/src/api.c
index d5d0ce75..ba977683 100644
--- a/src/api.c
+++ b/src/api.c
@@ -3303,7 +3303,7 @@ int cgroup_get_current_controller_path(pid_t pid, const char *controller,
 		}
 
 		token = strtok_r(controllers, ",", &savedptr);
-		do {
+		while (token) {
 			if (strncmp(controller, token, strlen(controller) + 1)
 								== 0) {
 				*current_path = strdup(cgroup_path);
@@ -3316,7 +3316,7 @@ int cgroup_get_current_controller_path(pid_t pid, const char *controller,
 				goto done;
 			}
 			token = strtok_r(NULL, ",", &savedptr);
-		} while (token);
+		}
 	}
 
 done: