diff options
| author | Antony Dovgal <tony2001@php.net> | 2008-03-05 12:10:18 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2008-03-05 12:10:18 +0000 |
| commit | eb81041b0aa17de23f23bb2546004bcadacb7a21 (patch) | |
| tree | b1415efa596dbcc5a1edbdf1795e2b87e5ea7f70 | |
| parent | 1a657482497bda72349859f2e01e370347beb81f (diff) | |
| download | php-git-eb81041b0aa17de23f23bb2546004bcadacb7a21.tar.gz | |
MFH: apply better fix
| -rw-r--r-- | ext/standard/dir.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/standard/dir.c b/ext/standard/dir.c index b49ab8c255..2822a1fc83 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -256,13 +256,15 @@ PHP_FUNCTION(closedir) { zval **id, **tmp, *myself; php_stream *dirp; + int rsrc_id; FETCH_DIRP(); - if (dirp->rsrc_id == DIRG(default_dir)) { + rsrc_id = dirp->rsrc_id; + zend_list_delete(dirp->rsrc_id); + + if (rsrc_id == DIRG(default_dir)) { php_set_default_dir(-1 TSRMLS_CC); - } else { - zend_list_delete(dirp->rsrc_id); } } /* }}} */ |