[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard dir.c

[Antony Dovgal]

tony2001                Wed Mar  5 12:10:18 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard       dir.c 
  Log:
  MFH: apply better fix
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.15&r2=1.147.2.3.2.16&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.15 
php-src/ext/standard/dir.c:1.147.2.3.2.16
--- php-src/ext/standard/dir.c:1.147.2.3.2.15   Wed Mar  5 09:29:37 2008
+++ php-src/ext/standard/dir.c  Wed Mar  5 12:10:18 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dir.c,v 1.147.2.3.2.15 2008/03/05 09:29:37 tony2001 Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.16 2008/03/05 12:10:18 tony2001 Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -256,13 +256,15 @@
 {
        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);
        }
 }
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php