cvs: php-src(PHP_4_3) /win32 readdir.c
| From: | Ilia Alshanetsky | Date: | Wed, 09 Jun 2004 14:18:16 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /win32 readdir.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-27594@lists.php.net to get a copy of this message | ||
iliaa Wed Jun 9 10:18:16 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/win32 readdir.c
Log:
MFH: Fixed memory leak on error in win32's opendir() emulation.
http://cvs.php.net/diff.php/php-src/win32/readdir.c?r1=1.8.4.2&r2=1.8.4.3&ty=u
Index: php-src/win32/readdir.c
diff -u php-src/win32/readdir.c:1.8.4.2 php-src/win32/readdir.c:1.8.4.3
--- php-src/win32/readdir.c:1.8.4.2 Mon Jan 27 20:51:26 2003
+++ php-src/win32/readdir.c Wed Jun 9 10:18:16 2004
@@ -37,14 +37,17 @@
dp = (DIR *) malloc(sizeof(DIR));
dp->offset = 0;
dp->finished = 0;
- dp->dir = strdup(dir);
if ((handle = _findfirst(filespec, &(dp->fileinfo))) < 0) {
- if (errno == ENOENT)
+ if (errno == ENOENT) {
dp->finished = 1;
- else
+ } else {
+ free(dp);
+ free(filespec);
return NULL;
+ }
}
+ dp->dir = strdup(dir);
dp->handle = handle;
free(filespec);