tony2001 Wed Mar 5 09:29:25 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dir.c
Log:
MFH: fix memory corruption due to double destruction of default dir handle
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12.2.3&r2=1.147.2.3.2.12.2.4&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12.2.3
php-src/ext/standard/dir.c:1.147.2.3.2.12.2.4
--- php-src/ext/standard/dir.c:1.147.2.3.2.12.2.3 Mon Dec 31 07:17:14 2007
+++ php-src/ext/standard/dir.c Wed Mar 5 09:29:25 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12.2.3 2007/12/31 07:17:14 sebastian Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.12.2.4 2008/03/05 09:29:25 tony2001 Exp $ */
/* {{{ includes/startup/misc */
@@ -261,9 +261,9 @@
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);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
