From: Antony Dovgal <tony2001@php.net>
Date: Wed, 5 Mar 2008 09:28:41 +0000 (+0000)
Subject: fix memory corruption due to double destruction of default dir handle
X-Git-Tag: RELEASE_2_0_0a1~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41bd0ca803e73cfd658638f3be1a64bb2bbb1103;p=php

fix memory corruption due to double destruction of default dir handle
(detected by ext/standard/tests/dir/readdir_variation6.phpt)
---

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index bf2c3ca4eb..64d1049ece 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -283,9 +283,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);
 }
 /* }}} */