[PHP-CVS] cvs: php-src /ext/standard var.c

[Dmitry Stogov]

dmitry          Thu Jul 21 03:18:05 2005 EDT

  Modified files:              
    /php-src/ext/standard       var.c 
  Log:
  Recursion protection
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.201&r2=1.202&ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.201 php-src/ext/standard/var.c:1.202
--- php-src/ext/standard/var.c:1.201    Tue Jun 28 05:46:30 2005
+++ php-src/ext/standard/var.c  Thu Jul 21 03:18:02 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: var.c,v 1.201 2005/06/28 09:46:30 stas Exp $ */
+/* $Id: var.c,v 1.202 2005/07/21 07:18:02 dmitry Exp $ */
 
 
 
@@ -252,10 +252,18 @@
                break;
        case IS_ARRAY:
                myht = Z_ARRVAL_PP(struc);
+               if (myht->nApplyCount > 1) {
+                       PUTS("*RECURSION*\n");
+                       return;
+               }
                php_printf("%sarray(%d) refcount(%u){\n", COMMON, 
zend_hash_num_elements(myht), Z_REFCOUNT_PP(struc));
                goto head_done;
        case IS_OBJECT:
                myht = Z_OBJPROP_PP(struc);
+               if (myht && myht->nApplyCount > 1) {
+                       PUTS("*RECURSION*\n");
+                       return;
+               }
                ce = Z_OBJCE(**struc);
                Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name, 
&class_name_len, 0 TSRMLS_CC);
                php_printf("%sobject(%s)#%d (%d) refcount(%u){\n", COMMON, 
class_name, Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0, 
Z_REFCOUNT_PP(struc));

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