From: Antony Dovgal <tony2001@php.net>
Date: Wed, 5 Mar 2008 12:10:18 +0000 (+0000)
Subject: MFH: apply better fix
X-Git-Tag: php-5.2.6RC2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb81041b0aa17de23f23bb2546004bcadacb7a21;p=php

MFH: apply better fix
---

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);
 	}
 }
 /* }}} */