commit 6575a1625ac585b46f90c6f036db9231db50c969
author Nick Kralevich <nnk@google.com> Tue Oct 23 10:46:55 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 23 10:46:55 2012 -0700
tree 4b67f9744a2f152f86bb7ca127bb1ab984b11d25
parent 066d3f9b3bd77df71542b132adda8eb25bc013c0
parent 8f98c4b5f011db8637ce1b9361e82d59b13434f4

am 8f98c4b5: Merge "Fix dirfd crash issue in property service"

* commit '8f98c4b5f011db8637ce1b9361e82d59b13434f4':
  Fix dirfd crash issue in property service

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 795adce..61dd86f 100755
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -512,13 +512,14 @@
 static void load_persistent_properties()
 {
     DIR* dir = opendir(PERSISTENT_PROPERTY_DIR);
-    int dir_fd = dirfd(dir);
+    int dir_fd;
     struct dirent*  entry;
     char value[PROP_VALUE_MAX];
     int fd, length;
     struct stat sb;
 
     if (dir) {
+        dir_fd = dirfd(dir);
         while ((entry = readdir(dir)) != NULL) {
             if (strncmp("persist.", entry->d_name, strlen("persist.")))
                 continue;