]> git.ipfire.org Git - thirdparty/libcgroup.git/commitdiff
cgroup_get_current_controller_path: test whether strtok_r returns NULL
authorIvana Hutarova Varekova <varekova@redhat.com>
Wed, 9 Oct 2013 09:41:22 +0000 (11:41 +0200)
committerIvana Hutarova Varekova <varekova@redhat.com>
Wed, 9 Oct 2013 09:41:22 +0000 (11:41 +0200)
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>
src/api.c

index d5d0ce75d503f2918a2eaa7014ed45cfd280c18c..ba977683714cebb6dd5d0e35899ed0c4e45a0f6a 100644 (file)
--- 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: