scottmac Wed Dec 24 18:09:01 2008 UTC
Modified files:
/php-src/ext/json json.c
Log:
Make sure we clear out the error when the scalar version decoding works.
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.45&r2=1.46&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.45 php-src/ext/json/json.c:1.46
--- php-src/ext/json/json.c:1.45 Fri Dec 19 02:00:59 2008
+++ php-src/ext/json/json.c Wed Dec 24 18:09:00 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: json.c,v 1.45 2008/12/19 02:00:59 scottmac Exp $ */
+/* $Id: json.c,v 1.46 2008/12/24 18:09:00 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -551,6 +551,8 @@
if (str_len == 4) {
if (!strcasecmp(str.s, "null")) {
+ /* We need to explicitly clear the error
because its an actual NULL and not an error */
+ jp->error_code = PHP_JSON_ERROR_NONE;
RETVAL_NULL();
} else if (!strcasecmp(str.s, "true")) {
RETVAL_BOOL(1);
@@ -566,6 +568,10 @@
RETVAL_DOUBLE(d);
}
}
+
+ if (Z_TYPE_P(return_value) != IS_NULL) {
+ jp->error_code = PHP_JSON_ERROR_NONE;
+ }
}
else
{
@@ -578,6 +584,8 @@
if (str_len == 4) {
if (ZEND_U_CASE_EQUAL(IS_UNICODE, str, str_len, "null",
sizeof("null")-1)) {
+ /* We need to explicitly clear the error
because its an actual NULL and not an error */
+ jp->error_code = PHP_JSON_ERROR_NONE;
RETVAL_NULL();
} else if (ZEND_U_CASE_EQUAL(IS_UNICODE, str, str_len,
"true", sizeof("true")-1)) {
RETVAL_BOOL(1);
@@ -593,6 +601,10 @@
RETVAL_DOUBLE(d);
}
}
+
+ if (Z_TYPE_P(return_value) != IS_NULL) {
+ jp->error_code = PHP_JSON_ERROR_NONE;
+ }
}
FREE_ZVAL(z);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
