commit 2145a6137e77c683bd5f98c7bb20805bc5cc8cb7
author Isaac Katzenelson <isaackatz@google.com> Thu Aug 21 03:29:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 21 03:29:59 2014 +0000
tree 1270f574f517ba20ec0d224f8fbc91d99dd82e40
parent 422bffb240e739210260438f5af843da98944b1e
parent 176fe9005df41c84c0145f4779222e3b00f3e40f

Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp

libprocessgroup/processgroup.cpp

diff --git a/libprocessgroup/processgroup.cpp b/libprocessgroup/processgroup.cpp
index c32e741..f7bc2cd 100644
--- a/libprocessgroup/processgroup.cpp
+++ b/libprocessgroup/processgroup.cpp
@@ -171,6 +171,7 @@
             SLOGV("removing %s\n", path);
             rmdir(path);
         }
+        closedir(uid);
     }
 }
 
@@ -180,8 +181,7 @@
     DIR *root = opendir(PROCESSGROUP_CGROUP_PATH);
     if (root == NULL) {
         SLOGE("failed to open %s: %s", PROCESSGROUP_CGROUP_PATH, strerror(errno));
-    }
-    if (root != NULL) {
+    } else {
         struct dirent cur;
         struct dirent *dir;
         while ((readdir_r(root, &cur, &dir) == 0) && dir) {
@@ -199,6 +199,7 @@
             SLOGV("removing %s\n", path);
             rmdir(path);
         }
+        closedir(root);
     }
 }