ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '8f98c4b5f011db8637ce1b9361e82d59b13434f4':
  Fix dirfd crash issue in property service
This commit is contained in:
Nick Kralevich 2012-10-23 10:46:55 -07:00 • committed by Android Git Automerger
commit 6575a1625a
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init/property_service.c
View file

@ -512,13 +512,14 @@ static void load_properties_from_file(const char *fn)
static void load_persistent_properties() static void load_persistent_properties()
{ {
DIR* dir = opendir(PERSISTENT_PROPERTY_DIR); DIR* dir = opendir(PERSISTENT_PROPERTY_DIR);
int dir_fd = dirfd(dir); int dir_fd;
struct dirent* entry; struct dirent* entry;
char value[PROP_VALUE_MAX]; char value[PROP_VALUE_MAX];
int fd, length; int fd, length;
struct stat sb; struct stat sb;
if (dir) { if (dir) {
dir_fd = dirfd(dir);
while ((entry = readdir(dir)) != NULL) { while ((entry = readdir(dir)) != NULL) {
if (strncmp("persist.", entry->d_name, strlen("persist."))) if (strncmp("persist.", entry->d_name, strlen("persist.")))
continue; continue;