]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
initialize lxc_fd_list before WARN return path
authorKen-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Tue, 18 Aug 2009 21:28:42 +0000 (23:28 +0200)
committerDaniel Lezcano <dlezcano@fr.ibm.com>
Tue, 18 Aug 2009 21:28:42 +0000 (23:28 +0200)
We should initialize lxc_fd_list before opendir in
__lxc_fd_collect_inherited in case of opendir returns error.

Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.doin.ne.jp>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
src/lxc/utils.c

index 7bfb9a30204d490837d81235424b522da843275e..492c885f25a99928b4a18a5b68b06d885485aa15 100644 (file)
@@ -145,6 +145,8 @@ static void __attribute__((constructor)) __lxc_fd_collect_inherited(void)
        int fd, fddir;
        DIR *dir;
 
+       lxc_list_init(&lxc_fd_list);
+
        dir = opendir("/proc/self/fd");
        if (!dir) {
                WARN("failed to open directory: %s", strerror(errno));
@@ -153,8 +155,6 @@ static void __attribute__((constructor)) __lxc_fd_collect_inherited(void)
 
        fddir = dirfd(dir);
 
-       lxc_list_init(&lxc_fd_list);
-
        while (!readdir_r(dir, &dirent, &direntp)) {
 
                if (!direntp)