generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Reorder DIR structure due to bad apps."

Browse Source
This commit is contained in:
Christopher Ferris
2015-06-04 21:05:42 +00:00
committed by Gerrit Code Review
parent 5cce2e7205 c062218a9b
commit b68b8b4b95
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libc/bionic/dirent.cpp
View File

@@ -41,13 +41,19 @@
extern "C" int __getdents64(unsigned int, dirent*, unsigned int); extern "C" int __getdents64(unsigned int, dirent*, unsigned int);
// Apportable decided to copy the data structure from this file
// and use it in their own code, but they also call into readdir.
// In order to avoid a lockup, the structure must be maintained in
// the exact same order as in L and below. New structure members
// need to be added to the end of this structure.
// See b/21037208 for more details.
struct DIR { struct DIR {
int fd_; int fd_;
size_t available_bytes_; size_t available_bytes_;
dirent* next_; dirent* next_;
long current_pos_;
pthread_mutex_t mutex_; pthread_mutex_t mutex_;
dirent buff_[15]; dirent buff_[15];
long current_pos_;
}; };
static DIR* __allocate_DIR(int fd) { static DIR* __allocate_DIR(int fd) {