archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

MFB: Thread-safety issues

Browse source
This commit is contained in:
Ilia Alshanetsky 2006-11-30 16:10:48 +00:00
parent 053747b512
commit 3fb8bece12
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main/php_scandir.c
View file

@ -62,6 +62,8 @@ int php_scandir(const char *dirname, struct dirent **namelist[], int (*selector)
struct dirent *dp = NULL; struct dirent *dp = NULL;
int vector_size = 0; int vector_size = 0;
int nfiles = 0; int nfiles = 0;
char entry[sizeof(struct dirent)+MAXPATHLEN];
struct dirent *result = (struct dirent *)&entry;
if (namelist == NULL) { if (namelist == NULL) {
return -1; return -1;
@ -71,7 +73,7 @@ int php_scandir(const char *dirname, struct dirent **namelist[], int (*selector)
return -1; return -1;
} }
while ((dp = readdir(dirp)) != NULL) { while ((dp = php_readdir_r(dirp, (struct dirent *)entry, &result)) == 0 && result) {
int dsize = 0; int dsize = 0;
struct dirent *newdp = NULL; struct dirent *newdp = NULL;