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

am f2e86cd9: Merge "Reorder DIR structure due to bad apps." into mnc-dev

Browse Source 
* commit 'f2e86cd98038d6239265d936c32774b7289bfdc7':
  Reorder DIR structure due to bad apps.
This commit is contained in:
Christopher Ferris 2015-06-04 21:22:41 +00:00 committed by Android Git Automerger
commit 699df5ca48
1 changed files with 7 additions and 1 deletions
Show Stats 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);
// 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 {
int fd_;
size_t available_bytes_;
dirent* next_;
long current_pos_;
pthread_mutex_t mutex_;
dirent buff_[15];
long current_pos_;
};
static DIR* __allocate_DIR(int fd) {