[PHP-CVS] cvs: php-src(PHP_5_2) /ext/json JSON_parser.c /ext/json/tests 001.phpt

[Antony Dovgal]

tony2001                Thu Jul 20 08:24:31 2006 UTC

  Added files:                 (Branch: PHP_5_2)
    /php-src/ext/json/tests     001.phpt 

  Modified files:              
    /php-src/ext/json   JSON_parser.c 
  Log:
  fix segfault, add test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1&r2=1.1.2.1&diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1 
php-src/ext/json/JSON_parser.c:1.1.2.1
--- php-src/ext/json/JSON_parser.c:1.1  Tue Jan 31 08:59:06 2006
+++ php-src/ext/json/JSON_parser.c      Thu Jul 20 08:24:31 2006
@@ -338,14 +338,14 @@
     {
         if (!assoc)
         {
-            add_property_zval(root, key->c, child);
+            add_property_zval_ex(root, (key->len ? key->c : "_empty_"), 
(key->len ? (key->len + 1) : sizeof("_empty_")), child);
 #if PHP_MAJOR_VERSION >= 5
             ZVAL_DELREF(child);
 #endif
         }
         else
         {
-            add_assoc_zval(root, key->c, child);
+            add_assoc_zval_ex(root, (key->len ? key->c : "_empty_"), (key->len 
? (key->len + 1) : sizeof("_empty_")), child);
         }
         key->len = 0;
     }
@@ -481,14 +481,14 @@
 
                     if (!assoc)
                     {
-                        add_property_zval(JSON(the_zstack)[JSON(the_top)], 
key.c, mval);
+                        add_property_zval_ex(JSON(the_zstack)[JSON(the_top)], 
(key.len ? key.c : "_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), 
mval);
 #if PHP_MAJOR_VERSION >= 5
                         ZVAL_DELREF(mval);
 #endif
                     }
                     else
                     {
-                        add_assoc_zval(JSON(the_zstack)[JSON(the_top)], key.c, 
mval);
+                        add_assoc_zval_ex(JSON(the_zstack)[JSON(the_top)], 
(key.len ? key.c : "_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), 
mval);
                     }
                     key.len = 0;
                     buf.len = 0;
@@ -604,14 +604,14 @@
                             {
                                 if (!assoc)
                                 {
-                                    
add_property_zval(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : 
"_empty_"), mval);
+                                    
add_property_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : 
"_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval);
 #if PHP_MAJOR_VERSION >= 5
                                     ZVAL_DELREF(mval);
 #endif
                                 }
                                 else
                                 {
-                                    
add_assoc_zval(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : "_empty_"), 
mval);
+                                    
add_assoc_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : 
"_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval);
                                 }
                                 key.len = 0;
                             }

http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/001.phpt?view=markup&rev=1.1
Index: php-src/ext/json/tests/001.phpt
+++ php-src/ext/json/tests/001.phpt
--TEST--
json_decode() tests
--FILE--
<?php

var_dump(json_decode());
var_dump(json_decode(""));
var_dump(json_decode("", 1));
var_dump(json_decode("", 0));
var_dump(json_decode(".", 1));
var_dump(json_decode(".", 0));
var_dump(json_decode("<?>"));
var_dump(json_decode(";"));
var_dump(json_decode("руссиш"));
var_dump(json_decode("blah"));
var_dump(json_decode(NULL));
var_dump(json_decode('{ "test": { "foo": "bar" } }'));
var_dump(json_decode('{ "test": { "foo": "" } }'));
var_dump(json_decode('{ "": { "foo": "" } }'));
var_dump(json_decode('{ "": { "": "" } }'));
var_dump(json_decode('{ "": { "": "" }'));
var_dump(json_decode('{ "": "": "" } }'));

echo "Done\n";
?>
--EXPECTF--
Warning: json_decode() expects at least 1 parameter, 0 given in %s on line %d
NULL
NULL
NULL
NULL
NULL
NULL
NULL
NULL
NULL
NULL
NULL
object(stdClass)#1 (1) {
  ["test"]=>
  object(stdClass)#2 (1) {
    ["foo"]=>
    string(3) "bar"
  }
}
object(stdClass)#1 (1) {
  ["test"]=>
  object(stdClass)#2 (1) {
    ["foo"]=>
    string(0) ""
  }
}
object(stdClass)#1 (1) {
  ["_empty_"]=>
  object(stdClass)#2 (1) {
    ["foo"]=>
    string(0) ""
  }
}
object(stdClass)#1 (1) {
  ["_empty_"]=>
  object(stdClass)#2 (1) {
    ["_empty_"]=>
    string(0) ""
  }
}
NULL
NULL
Done

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