summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich2012-10-23 12:46:55 -0500
committerAndroid Git Automerger2012-10-23 12:46:55 -0500
commit6575a1625ac585b46f90c6f036db9231db50c969 (patch)
tree4b67f9744a2f152f86bb7ca127bb1ab984b11d25 /init/property_service.c
parent066d3f9b3bd77df71542b132adda8eb25bc013c0 (diff)
parent8f98c4b5f011db8637ce1b9361e82d59b13434f4 (diff)
downloadplatform-system-core-6575a1625ac585b46f90c6f036db9231db50c969.tar.gz
platform-system-core-6575a1625ac585b46f90c6f036db9231db50c969.tar.xz
platform-system-core-6575a1625ac585b46f90c6f036db9231db50c969.zip
am 8f98c4b5: Merge "Fix dirfd crash issue in property service"
* commit '8f98c4b5f011db8637ce1b9361e82d59b13434f4': Fix dirfd crash issue in property service
Diffstat (limited to 'init/property_service.c')
-rwxr-xr-xinit/property_service.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/property_service.c b/init/property_service.c
index 795adce32..61dd86fdc 100755
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -512,13 +512,14 @@ static void load_properties_from_file(const char *fn)
512static void load_persistent_properties() 512static void load_persistent_properties()
513{ 513{
514 DIR* dir = opendir(PERSISTENT_PROPERTY_DIR); 514 DIR* dir = opendir(PERSISTENT_PROPERTY_DIR);
515 int dir_fd = dirfd(dir); 515 int dir_fd;
516 struct dirent* entry; 516 struct dirent* entry;
517 char value[PROP_VALUE_MAX]; 517 char value[PROP_VALUE_MAX];
518 int fd, length; 518 int fd, length;
519 struct stat sb; 519 struct stat sb;
520 520
521 if (dir) { 521 if (dir) {
522 dir_fd = dirfd(dir);
522 while ((entry = readdir(dir)) != NULL) { 523 while ((entry = readdir(dir)) != NULL) {
523 if (strncmp("persist.", entry->d_name, strlen("persist."))) 524 if (strncmp("persist.", entry->d_name, strlen("persist.")))
524 continue; 525 continue;