From eb81041b0aa17de23f23bb2546004bcadacb7a21 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Wed, 5 Mar 2008 12:10:18 +0000 Subject: [PATCH] MFH: apply better fix --- ext/standard/dir.c | 8 +++++--- 1 file 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); } } /* }}} */ -- 2.50.1