commit 8f98c4b5f011db8637ce1b9361e82d59b13434f4
author Nick Kralevich <nnk@google.com> Tue Oct 23 09:58:25 2012 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 23 09:58:25 2012 -0700
tree 11080b74ed9c2df8bde43b89746915f563b0bd52
parent 3e5e9e9ee2ee24072b7b87a3e4eda2df0639a469
parent e41bc3155588c2fdc23b512a959e20e896da5180

Merge "Fix dirfd crash issue in property service"

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 2c1b4a1..31bc55a 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -510,13 +510,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;