summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2008-03-05 09:29:25 +0000
committerAntony Dovgal <tony2001@php.net>2008-03-05 09:29:25 +0000
commit391da778fbcbe678ebbaf7f37647aa9bb34ebac6 (patch)
tree5b33fec2736a0d64277ec8fdad0eb23d2c04a26f
parentc3b6ca3b8f1390d78c7974a2490ee36a24ef728f (diff)
downloadphp-git-391da778fbcbe678ebbaf7f37647aa9bb34ebac6.tar.gz
MFH: fix memory corruption due to double destruction of default dir handle
-rw-r--r--ext/standard/dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index b381500bb4..0a42fd055c 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -261,9 +261,9 @@ PHP_FUNCTION(closedir)
if (dirp->rsrc_id == DIRG(default_dir)) {
php_set_default_dir(-1 TSRMLS_CC);
+ } else {
+ zend_list_delete(dirp->rsrc_id);
}
-
- zend_list_delete(dirp->rsrc_id);
}
/* }}} */