[PHP-CVS] cvs: php-src(PHP_5_3) /ext/json json.c

[Felipe Pena]

felipe          Thu Oct  2 03:36:20 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/json   json.c 
  Log:
  - MFH: Fixed bug #46215 (json_encode mutates its parameter and has some 
class-specific state)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19.2.8&r2=1.9.2.19.2.9&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.19.2.8 
php-src/ext/json/json.c:1.9.2.19.2.9
--- php-src/ext/json/json.c:1.9.2.19.2.8        Tue Jul 22 15:30:03 2008
+++ php-src/ext/json/json.c     Thu Oct  2 03:36:20 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: json.c,v 1.9.2.19.2.8 2008/07/22 15:30:03 jani Exp $ */
+/* $Id: json.c,v 1.9.2.19.2.9 2008/10/02 03:36:20 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -211,6 +211,9 @@
                                        if (i == HASH_KEY_IS_STRING) {
                                                if (key[0] == '\0' && 
Z_TYPE_PP(val) == IS_OBJECT) {
                                                        /* Skip protected and 
private members. */
+                                                       if (tmp_ht) {
+                                                               
tmp_ht->nApplyCount--;
+                                                       }
                                                        continue;
                                                }
 



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