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

[Felipe Pena]

felipe          Thu Oct  2 03:30:54 2008 UTC

  Modified files:              
    /php-src/ext/json   json.c 
  Log:
  - 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.38&r2=1.39&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.38 php-src/ext/json/json.c:1.39
--- php-src/ext/json/json.c:1.38        Tue Jul 22 17:06:00 2008
+++ php-src/ext/json/json.c     Thu Oct  2 03:30:54 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: json.c,v 1.38 2008/07/22 17:06:00 jani Exp $ */
+/* $Id: json.c,v 1.39 2008/10/02 03:30:54 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -211,6 +211,9 @@
                                        if (i == HASH_KEY_IS_STRING || i == 
HASH_KEY_IS_UNICODE) {
                                                if (key.s[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