php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Port JSON

Browse Source
This commit is contained in:
Nikita Popov
2014-04-23 21:44:26 +02:00
parent 404cc45ee2
commit b30c7fe263
6 changed files with 191 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend_hash.c
+2 -2
View File
@@ -66,12 +66,12 @@ static void _zend_is_inconsistent(const HashTable *ht, const char *file, int lin
if ((ht)->u.flags >= (3 << 8)) { \
zend_error_noreturn(E_ERROR, "Nesting level too deep - recursive dependency?");\
} \
(ht)->u.flags += (1 << 8); \
ZEND_HASH_INC_APPLY_COUNT(ht); \
}
#define HASH_UNPROTECT_RECURSION(ht) \
if ((ht)->u.flags & HASH_FLAG_APPLY_PROTECTION) { \
(ht)->u.flags -= (1 << 8); \
ZEND_HASH_DEC_APPLY_COUNT(ht); \
}
#define ZEND_HASH_IF_FULL_DO_RESIZE(ht) \
Zend/zend_hash.h
+5
View File
@@ -640,6 +640,11 @@ static inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht, HashPositio
_key = _p->key; \
_val = _z;
#define ZEND_HASH_APPLY_SHIFT 8
#define ZEND_HASH_GET_APPLY_COUNT(ht) (ht->u.flags >> ZEND_HASH_APPLY_SHIFT)
#define ZEND_HASH_INC_APPLY_COUNT(ht) (ht->u.flags += (1 << ZEND_HASH_APPLY_SHIFT))
#define ZEND_HASH_DEC_APPLY_COUNT(ht) (ht->u.flags -= (1 << ZEND_HASH_APPLY_SHIFT))
#endif /* ZEND_HASH_H */
/*
ext/json/JSON_parser.c
+81 -85
View File
@@ -248,7 +248,7 @@ new_JSON_parser(int depth)
jp->error_code = PHP_JSON_ERROR_NONE;
jp->stack = (int*)ecalloc(depth, sizeof(int));
if (depth > JSON_PARSER_DEFAULT_DEPTH) {
jp->the_zstack = (zval **)safe_emalloc(depth, sizeof(zval), 0);
jp->the_zstack = (zval *) safe_emalloc(depth, sizeof(zval), 0);
} else {
jp->the_zstack = &jp->the_static_zstack[0];
}
@@ -291,23 +291,21 @@ static int dehexchar(char c)
}
static void json_create_zval(zval **z, smart_str *buf, int type, int options)
static void json_create_zval(zval *z, smart_str *buf, int type, int options)
{
ALLOC_INIT_ZVAL(*z);
if (type == IS_LONG)
{
zend_bool bigint = 0;
if (buf->c[0] == '-') {
buf->len--;
if (buf->s->val[0] == '-') {
buf->s->len--;
}
if (buf->len >= MAX_LENGTH_OF_LONG - 1) {
if (buf->len == MAX_LENGTH_OF_LONG - 1) {
int cmp = strcmp(buf->c + (buf->c[0] == '-'), long_min_digits);
if (buf->s->len >= MAX_LENGTH_OF_LONG - 1) {
if (buf->s->len == MAX_LENGTH_OF_LONG - 1) {
int cmp = strcmp(buf->s->val + (buf->s->val[0] == '-'), long_min_digits);
if (!(cmp < 0 || (cmp == 0 && buf->c[0] == '-'))) {
if (!(cmp < 0 || (cmp == 0 && buf->s->val[0] == '-'))) {
bigint = 1;
}
} else {
@@ -318,9 +316,9 @@ static void json_create_zval(zval **z, smart_str *buf, int type, int options)
if (bigint) {
/* value too large to represent as a long */
if (options & PHP_JSON_BIGINT_AS_STRING) {
if (buf->c[0] == '-') {
if (buf->s->val[0] == '-') {
/* Restore last char consumed above */
buf->len++;
buf->s->len++;
}
goto use_string;
} else {
@@ -328,25 +326,31 @@ static void json_create_zval(zval **z, smart_str *buf, int type, int options)
}
}
ZVAL_LONG(*z, strtol(buf->c, NULL, 10));
ZVAL_LONG(z, strtol(buf->s->val, NULL, 10));
}
else if (type == IS_DOUBLE)
{
use_double:
ZVAL_DOUBLE(*z, zend_strtod(buf->c, NULL));
ZVAL_DOUBLE(z, zend_strtod(buf->s->val, NULL));
}
else if (type == IS_STRING)
{
use_string:
ZVAL_STRINGL(*z, buf->c, buf->len, 1);
if (buf->s) {
ZVAL_STRINGL(z, buf->s->val, buf->s->len);
} else {
ZVAL_EMPTY_STRING(z);
}
}
else if (type == IS_BOOL)
{
ZVAL_BOOL(*z, (*(buf->c) == 't'));
else if (type == IS_FALSE) {
ZVAL_FALSE(z);
}
else if (type == IS_TRUE) {
ZVAL_TRUE(z);
}
else /* type == IS_NULL) || type unknown */
{
ZVAL_NULL(*z);
ZVAL_NULL(z);
}
}
@@ -363,18 +367,18 @@ static void utf16_to_utf8(smart_str *buf, unsigned short utf16)
smart_str_appendc(buf, 0x80 | (utf16 & 0x3f));
}
else if ((utf16 & 0xfc00) == 0xdc00
&& buf->len >= 3
&& ((unsigned char) buf->c[buf->len - 3]) == 0xed
&& ((unsigned char) buf->c[buf->len - 2] & 0xf0) == 0xa0
&& ((unsigned char) buf->c[buf->len - 1] & 0xc0) == 0x80)
&& buf->s->len >= 3
&& ((unsigned char) buf->s->val[buf->s->len - 3]) == 0xed
&& ((unsigned char) buf->s->val[buf->s->len - 2] & 0xf0) == 0xa0
&& ((unsigned char) buf->s->val[buf->s->len - 1] & 0xc0) == 0x80)
{
/* found surrogate pair */
unsigned long utf32;
utf32 = (((buf->c[buf->len - 2] & 0xf) << 16)
| ((buf->c[buf->len - 1] & 0x3f) << 10)
utf32 = (((buf->s->val[buf->s->len - 2] & 0xf) << 16)
| ((buf->s->val[buf->s->len - 1] & 0x3f) << 10)
| (utf16 & 0x3ff)) + 0x10000;
buf->len -= 3;
buf->s->len -= 3;
smart_str_appendc(buf, (unsigned char) (0xf0 | (utf32 >> 18)));
smart_str_appendc(buf, 0x80 | ((utf32 >> 12) & 0x3f));
@@ -389,10 +393,24 @@ static void utf16_to_utf8(smart_str *buf, unsigned short utf16)
}
}
static inline void add_assoc_or_property(int assoc, zval *target, smart_str *key, zval *zv TSRMLS_DC)
{
zend_bool empty_key = !key->s || key->s->len == 0;
if (!assoc) {
add_property_zval_ex(target, empty_key ? "_empty_" : key->s->val, empty_key ? sizeof("_empty_")-1 : key->s->len, zv TSRMLS_CC);
if (Z_REFCOUNTED_P(zv)) Z_DELREF_P(zv);
} else {
add_assoc_zval_ex(target, empty_key ? "" : key->s->val, empty_key ? 0 : key->s->len, zv);
}
if (key->s) {
key->s->len = 0;
}
}
static void attach_zval(JSON_parser jp, int up, int cur, smart_str *key, int assoc TSRMLS_DC)
{
zval *root = jp->the_zstack[up];
zval *child = jp->the_zstack[cur];
zval *root = &jp->the_zstack[up];
zval *child = &jp->the_zstack[cur];
int up_mode = jp->stack[up];
if (up_mode == MODE_ARRAY)
@@ -401,30 +419,20 @@ static void attach_zval(JSON_parser jp, int up, int cur, smart_str *key, int ass
}
else if (up_mode == MODE_OBJECT)
{
if (!assoc)
{
add_property_zval_ex(root, (key->len ? key->c : "_empty_"), (key->len ? (key->len + 1) : sizeof("_empty_")), child TSRMLS_CC);
Z_DELREF_P(child);
}
else
{
add_assoc_zval_ex(root, (key->len ? key->c : ""), (key->len ? (key->len + 1) : sizeof("")), child);
}
key->len = 0;
add_assoc_or_property(assoc, root, key, child TSRMLS_CC);
}
}
#define FREE_BUFFERS() smart_str_free(&buf); smart_str_free(&key);
#define SWAP_BUFFERS(from, to) do { \
char *t1 = from.c; \
zend_string *t1 = from.s; \
int t2 = from.a; \
from.c = to.c; \
from.s = to.s; \
from.a = to.a; \
to.c = t1; \
to.s = t1; \
to.a = t2; \
to.len = from.len; \
from.len = 0; \
if (from.s) { from.s->len = 0; } \
} while(0);
#define JSON_RESET_TYPE() type = -1;
@@ -519,8 +527,10 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
smart_str_appendc(&buf, next_char);
} else if (type < IS_STRING && next_class == C_QUOTE) {
type = IS_STRING;
} else if (type < IS_BOOL && ((jp->state == T3 && next_state == OK) || (jp->state == F4 && next_state == OK))) {
type = IS_BOOL;
} else if (type < IS_FALSE && (jp->state == F4 && next_state == OK)) {
type = IS_FALSE;
} else if (type < IS_TRUE && (jp->state == T3 && next_state == OK)) {
type = IS_TRUE;
} else if (type < IS_NULL && jp->state == N3 && next_state == OK) {
type = IS_NULL;
} else if (type != IS_STRING && next_class > C_WHITE) {
@@ -544,19 +554,14 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
case -8:
if (type != -1 && jp->stack[jp->top] == MODE_OBJECT)
{
zval *mval;
zval mval;
smart_str_0(&buf);
json_create_zval(&mval, &buf, type, options);
if (!assoc) {
add_property_zval_ex(jp->the_zstack[jp->top], (key.len ? key.c : "_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval TSRMLS_CC);
Z_DELREF_P(mval);
} else {
add_assoc_zval_ex(jp->the_zstack[jp->top], (key.len ? key.c : ""), (key.len ? (key.len + 1) : sizeof("")), mval);
}
key.len = 0;
buf.len = 0;
add_assoc_or_property(assoc, &jp->the_zstack[jp->top], &key, &mval TSRMLS_CC);
if (buf.s) { buf.s->len = 0; }
JSON_RESET_TYPE();
}
@@ -572,12 +577,12 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
{
if (type != -1 && jp->stack[jp->top] == MODE_ARRAY)
{
zval *mval;
zval mval;
smart_str_0(&buf);
json_create_zval(&mval, &buf, type, options);
add_next_index_zval(jp->the_zstack[jp->top], mval);
buf.len = 0;
add_next_index_zval(&jp->the_zstack[jp->top], &mval);
buf.s->len = 0;
JSON_RESET_TYPE();
}
@@ -597,13 +602,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
jp->state = OB;
if (jp->top > 0) {
zval *obj;
if (jp->top == 1) {
obj = z;
} else {
ALLOC_INIT_ZVAL(obj);
}
zval *obj = &jp->the_zstack[jp->top];
if (!assoc) {
object_init(obj);
@@ -611,7 +610,9 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
array_init(obj);
}
jp->the_zstack[jp->top] = obj;
if (jp->top == 1) {
ZVAL_COPY_VALUE(z, obj);
}
if (jp->top > 1) {
attach_zval(jp, jp->top - 1, jp->top, &key, assoc TSRMLS_CC);
@@ -630,16 +631,13 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
jp->state = AR;
if (jp->top > 0) {
zval *arr;
if (jp->top == 1) {
arr = z;
} else {
ALLOC_INIT_ZVAL(arr);
}
zval *arr = &jp->the_zstack[jp->top];
array_init(arr);
jp->the_zstack[jp->top] = arr;
if (jp->top == 1) {
ZVAL_COPY_VALUE(z, arr);
}
if (jp->top > 1) {
attach_zval(jp, jp->top - 1, jp->top, &key, assoc TSRMLS_CC);
@@ -665,8 +663,12 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
break;
case MODE_DONE:
if (type == IS_STRING) {
smart_str_0(&buf);
ZVAL_STRINGL(z, buf.c, buf.len, 1);
if (buf.s) {
smart_str_0(&buf);
ZVAL_STRINGL(z, buf.s->val, buf.s->len);
} else {
ZVAL_EMPTY_STRING(z);
}
jp->state = OK;
break;
}
@@ -680,7 +682,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
/* , */
case -3:
{
zval *mval;
zval mval;
if (type != -1 &&
(jp->stack[jp->top] == MODE_OBJECT ||
@@ -694,20 +696,14 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
case MODE_OBJECT:
if (pop(jp, MODE_OBJECT) && push(jp, MODE_KEY)) {
if (type != -1) {
if (!assoc) {
add_property_zval_ex(jp->the_zstack[jp->top], (key.len ? key.c : "_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval TSRMLS_CC);
Z_DELREF_P(mval);
} else {
add_assoc_zval_ex(jp->the_zstack[jp->top], (key.len ? key.c : ""), (key.len ? (key.len + 1) : sizeof("")), mval);
}
key.len = 0;
add_assoc_or_property(assoc, &jp->the_zstack[jp->top], &key, &mval TSRMLS_CC);
}
jp->state = KE;
}
break;
case MODE_ARRAY:
if (type != -1) {
add_next_index_zval(jp->the_zstack[jp->top], mval);
add_next_index_zval(&jp->the_zstack[jp->top], &mval);
}
jp->state = VA;
break;
@@ -716,7 +712,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
jp->error_code = PHP_JSON_ERROR_SYNTAX;
return false;
}
buf.len = 0;
buf.s->len = 0;
JSON_RESET_TYPE();
}
break;
ext/json/JSON_parser.h
+2 -2
View File
@@ -15,8 +15,8 @@ typedef struct JSON_parser_struct {
int top;
int error_code;
int* stack;
zval **the_zstack;
zval *the_static_zstack[JSON_PARSER_DEFAULT_DEPTH];
zval *the_zstack;
zval the_static_zstack[JSON_PARSER_DEFAULT_DEPTH];
} * JSON_parser;
enum error_codes {
ext/json/json.c
+100 -117
View File
@@ -169,27 +169,19 @@ static PHP_MINFO_FUNCTION(json)
static void json_escape_string(smart_str *buf, char *s, int len, int options TSRMLS_DC);
static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
static int json_determine_array_type(zval *val TSRMLS_DC) /* {{{ */
{
int i;
HashTable *myht = HASH_OF(*val);
HashTable *myht = HASH_OF(val);
i = myht ? zend_hash_num_elements(myht) : 0;
if (i > 0) {
char *key;
zend_string *key;
ulong index, idx;
uint key_len;
HashPosition pos;
zend_hash_internal_pointer_reset_ex(myht, &pos);
idx = 0;
for (;; zend_hash_move_forward_ex(myht, &pos)) {
i = zend_hash_get_current_key_ex(myht, &key, &key_len, &index, 0, &pos);
if (i == HASH_KEY_NON_EXISTENT) {
break;
}
if (i == HASH_KEY_IS_STRING) {
ZEND_HASH_FOREACH_KEY(myht, index, key) {
if (key) {
return PHP_JSON_OUTPUT_OBJECT;
} else {
if (index != idx) {
@@ -197,7 +189,7 @@ static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
}
}
idx++;
}
} ZEND_HASH_FOREACH_END();
}
return PHP_JSON_OUTPUT_ARRAY;
@@ -228,20 +220,20 @@ static inline void json_pretty_print_indent(smart_str *buf, int options TSRMLS_D
/* }}} */
static void json_encode_array(smart_str *buf, zval **val, int options TSRMLS_DC) /* {{{ */
static void json_encode_array(smart_str *buf, zval *val, int options TSRMLS_DC) /* {{{ */
{
int i, r, need_comma = 0;
HashTable *myht;
if (Z_TYPE_PP(val) == IS_ARRAY) {
myht = HASH_OF(*val);
if (Z_TYPE_P(val) == IS_ARRAY) {
myht = HASH_OF(val);
r = (options & PHP_JSON_FORCE_OBJECT) ? PHP_JSON_OUTPUT_OBJECT : json_determine_array_type(val TSRMLS_CC);
} else {
myht = Z_OBJPROP_PP(val);
myht = Z_OBJPROP_P(val);
r = PHP_JSON_OUTPUT_OBJECT;
}
if (myht && myht->nApplyCount > 1) {
if (myht && ZEND_HASH_GET_APPLY_COUNT(myht) > 1) {
JSON_G(error_code) = PHP_JSON_ERROR_RECURSION;
smart_str_appendl(buf, "null", 4);
return;
@@ -257,28 +249,39 @@ static void json_encode_array(smart_str *buf, zval **val, int options TSRMLS_DC)
i = myht ? zend_hash_num_elements(myht) : 0;
if (i > 0)
{
char *key;
zval **data;
if (i > 0) {
zend_string *key;
zval *data;
ulong index;
uint key_len;
HashPosition pos;
HashTable *tmp_ht;
zend_hash_internal_pointer_reset_ex(myht, &pos);
for (;; zend_hash_move_forward_ex(myht, &pos)) {
i = zend_hash_get_current_key_ex(myht, &key, &key_len, &index, 0, &pos);
if (i == HASH_KEY_NON_EXISTENT)
break;
ZEND_HASH_FOREACH_KEY_VAL_IND(myht, index, key, data) {
ZVAL_DEREF(data);
tmp_ht = HASH_OF(data);
if (tmp_ht) {
ZEND_HASH_INC_APPLY_COUNT(tmp_ht);
}
if (zend_hash_get_current_data_ex(myht, (void **) &data, &pos) == SUCCESS) {
tmp_ht = HASH_OF(*data);
if (tmp_ht) {
tmp_ht->nApplyCount++;
if (r == PHP_JSON_OUTPUT_ARRAY) {
if (need_comma) {
smart_str_appendc(buf, ',');
} else {
need_comma = 1;
}
if (r == PHP_JSON_OUTPUT_ARRAY) {
json_pretty_print_char(buf, options, '\n' TSRMLS_CC);
json_pretty_print_indent(buf, options TSRMLS_CC);
php_json_encode(buf, data, options TSRMLS_CC);
} else if (r == PHP_JSON_OUTPUT_OBJECT) {
if (key) {
if (key->val[0] == '\0' && Z_TYPE_P(val) == IS_OBJECT) {
/* Skip protected and private members. */
if (tmp_ht) {
ZEND_HASH_DEC_APPLY_COUNT(tmp_ht);
}
continue;
}
if (need_comma) {
smart_str_appendc(buf, ',');
} else {
@@ -287,58 +290,38 @@ static void json_encode_array(smart_str *buf, zval **val, int options TSRMLS_DC)
json_pretty_print_char(buf, options, '\n' TSRMLS_CC);
json_pretty_print_indent(buf, options TSRMLS_CC);
php_json_encode(buf, *data, options TSRMLS_CC);
} else if (r == PHP_JSON_OUTPUT_OBJECT) {
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;
}
if (need_comma) {
smart_str_appendc(buf, ',');
} else {
need_comma = 1;
}
json_escape_string(buf, key->val, key->len, options & ~PHP_JSON_NUMERIC_CHECK TSRMLS_CC);
smart_str_appendc(buf, ':');
json_pretty_print_char(buf, options, '\n' TSRMLS_CC);
json_pretty_print_indent(buf, options TSRMLS_CC);
json_pretty_print_char(buf, options, ' ' TSRMLS_CC);
json_escape_string(buf, key, key_len - 1, options & ~PHP_JSON_NUMERIC_CHECK TSRMLS_CC);
smart_str_appendc(buf, ':');
json_pretty_print_char(buf, options, ' ' TSRMLS_CC);
php_json_encode(buf, *data, options TSRMLS_CC);
php_json_encode(buf, data, options TSRMLS_CC);
} else {
if (need_comma) {
smart_str_appendc(buf, ',');
} else {
if (need_comma) {
smart_str_appendc(buf, ',');
} else {
need_comma = 1;
}
json_pretty_print_char(buf, options, '\n' TSRMLS_CC);
json_pretty_print_indent(buf, options TSRMLS_CC);
smart_str_appendc(buf, '"');
smart_str_append_long(buf, (long) index);
smart_str_appendc(buf, '"');
smart_str_appendc(buf, ':');
json_pretty_print_char(buf, options, ' ' TSRMLS_CC);
php_json_encode(buf, *data, options TSRMLS_CC);
need_comma = 1;
}
}
if (tmp_ht) {
tmp_ht->nApplyCount--;
json_pretty_print_char(buf, options, '\n' TSRMLS_CC);
json_pretty_print_indent(buf, options TSRMLS_CC);
smart_str_appendc(buf, '"');
smart_str_append_long(buf, (long) index);
smart_str_appendc(buf, '"');
smart_str_appendc(buf, ':');
json_pretty_print_char(buf, options, ' ' TSRMLS_CC);
php_json_encode(buf, data, options TSRMLS_CC);
}
}
}
if (tmp_ht) {
ZEND_HASH_DEC_APPLY_COUNT(tmp_ht);
}
} ZEND_HASH_FOREACH_END();
}
if (JSON_G(encoder_depth) > JSON_G(encode_max_depth)) {
@@ -559,7 +542,7 @@ static void json_escape_string(smart_str *buf, char *s, int len, int options TSR
static void json_encode_serializable_object(smart_str *buf, zval *val, int options TSRMLS_DC) /* {{{ */
{
zend_class_entry *ce = Z_OBJCE_P(val);
zval *retval = NULL, fname;
zval retval, fname;
HashTable* myht;
if (Z_TYPE_P(val) == IS_ARRAY) {
@@ -568,54 +551,57 @@ static void json_encode_serializable_object(smart_str *buf, zval *val, int optio
myht = Z_OBJPROP_P(val);
}
if (myht && myht->nApplyCount > 1) {
if (myht && ZEND_HASH_GET_APPLY_COUNT(myht) > 1) {
JSON_G(error_code) = PHP_JSON_ERROR_RECURSION;
smart_str_appendl(buf, "null", 4);
return;
}
ZVAL_STRING(&fname, "jsonSerialize", 0);
ZVAL_STRING(&fname, "jsonSerialize");
if (FAILURE == call_user_function_ex(EG(function_table), &val, &fname, &retval, 0, NULL, 1, NULL TSRMLS_CC) || !retval) {
if (FAILURE == call_user_function_ex(EG(function_table), val, &fname, &retval, 0, NULL, 1, NULL TSRMLS_CC) || Z_TYPE(retval) == IS_UNDEF) {
zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Failed calling %s::jsonSerialize()", ce->name);
smart_str_appendl(buf, "null", sizeof("null") - 1);
zval_ptr_dtor(&fname);
return;
}
if (EG(exception)) {
/* Error already raised */
zval_ptr_dtor(&retval);
zval_ptr_dtor(&fname);
smart_str_appendl(buf, "null", sizeof("null") - 1);
return;
}
if ((Z_TYPE_P(retval) == IS_OBJECT) &&
(Z_OBJ_HANDLE_P(retval) == Z_OBJ_HANDLE_P(val))) {
if ((Z_TYPE(retval) == IS_OBJECT) &&
(Z_OBJ_HANDLE(retval) == Z_OBJ_HANDLE_P(val))) {
/* Handle the case where jsonSerialize does: return $this; by going straight to encode array */
json_encode_array(buf, &retval, options TSRMLS_CC);
} else {
/* All other types, encode as normal */
php_json_encode(buf, retval, options TSRMLS_CC);
php_json_encode(buf, &retval, options TSRMLS_CC);
}
zval_ptr_dtor(&retval);
zval_ptr_dtor(&fname);
}
/* }}} */
PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_DC) /* {{{ */
{
again:
switch (Z_TYPE_P(val))
{
case IS_NULL:
smart_str_appendl(buf, "null", 4);
break;
case IS_BOOL:
if (Z_BVAL_P(val)) {
smart_str_appendl(buf, "true", 4);
} else {
smart_str_appendl(buf, "false", 5);
}
case IS_TRUE:
smart_str_appendl(buf, "true", 4);
break;
case IS_FALSE:
smart_str_appendl(buf, "false", 5);
break;
case IS_LONG:
@@ -650,9 +636,13 @@ PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_
}
/* fallthrough -- Non-serializable object */
case IS_ARRAY:
json_encode_array(buf, &val, options TSRMLS_CC);
json_encode_array(buf, val, options TSRMLS_CC);
break;
case IS_REFERENCE:
val = Z_REFVAL_P(val);
goto again;
default:
JSON_G(error_code) = PHP_JSON_ERROR_UNSUPPORTED_TYPE;
smart_str_appendl(buf, "null", 4);
@@ -666,7 +656,6 @@ PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_
PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, int str_len, int options, long depth TSRMLS_DC) /* {{{ */
{
int utf16_len;
zval *z;
unsigned short *utf16;
JSON_parser jp;
@@ -687,19 +676,16 @@ PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, int str_len,
RETURN_NULL();
}
ALLOC_INIT_ZVAL(z);
jp = new_JSON_parser(depth);
if (parse_JSON_ex(jp, z, utf16, utf16_len, options TSRMLS_CC)) {
*return_value = *z;
}
else
{
if (!parse_JSON_ex(jp, return_value, utf16, utf16_len, options TSRMLS_CC)) {
double d;
int type, overflow_info;
long p;
char *trim = str;
int trim_len = str_len;
zval_dtor(return_value);
/* Increment trimmed string pointer to strip leading whitespace */
/* JSON RFC says to consider as whitespace: space, tab, LF or CR */
while (trim_len && (*trim == ' ' || *trim == '\t' || *trim == '\n' || *trim == '\r')) {
@@ -750,7 +736,7 @@ PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, int str_len,
if (is_float) {
RETVAL_DOUBLE(d);
} else {
RETVAL_STRINGL(trim, trim_len, 1);
RETVAL_STRINGL(trim, trim_len);
}
} else {
RETVAL_DOUBLE(d);
@@ -761,10 +747,7 @@ PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, int str_len,
if (Z_TYPE_P(return_value) != IS_NULL) {
jp->error_code = PHP_JSON_ERROR_NONE;
}
zval_dtor(z);
}
FREE_ZVAL(z);
efree(utf16);
JSON_G(error_code) = jp->error_code;
free_JSON_parser(jp);
@@ -792,12 +775,12 @@ static PHP_FUNCTION(json_encode)
php_json_encode(&buf, parameter, options TSRMLS_CC);
if (JSON_G(error_code) != PHP_JSON_ERROR_NONE && !(options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR)) {
smart_str_free(&buf);
ZVAL_FALSE(return_value);
} else {
ZVAL_STRINGL(return_value, buf.c, buf.len, 1);
smart_str_0(&buf); /* copy? */
ZVAL_STR(return_value, buf.s);
}
smart_str_free(&buf);
}
/* }}} */
@@ -854,25 +837,25 @@ static PHP_FUNCTION(json_last_error_msg)
switch(JSON_G(error_code)) {
case PHP_JSON_ERROR_NONE:
RETURN_STRING("No error", 1);
RETURN_STRING("No error");
case PHP_JSON_ERROR_DEPTH:
RETURN_STRING("Maximum stack depth exceeded", 1);
RETURN_STRING("Maximum stack depth exceeded");
case PHP_JSON_ERROR_STATE_MISMATCH:
RETURN_STRING("State mismatch (invalid or malformed JSON)", 1);
RETURN_STRING("State mismatch (invalid or malformed JSON)");
case PHP_JSON_ERROR_CTRL_CHAR:
RETURN_STRING("Control character error, possibly incorrectly encoded", 1);
RETURN_STRING("Control character error, possibly incorrectly encoded");
case PHP_JSON_ERROR_SYNTAX:
RETURN_STRING("Syntax error", 1);
RETURN_STRING("Syntax error");
case PHP_JSON_ERROR_UTF8:
RETURN_STRING("Malformed UTF-8 characters, possibly incorrectly encoded", 1);
RETURN_STRING("Malformed UTF-8 characters, possibly incorrectly encoded");
case PHP_JSON_ERROR_RECURSION:
RETURN_STRING("Recursion detected", 1);
RETURN_STRING("Recursion detected");
case PHP_JSON_ERROR_INF_OR_NAN:
RETURN_STRING("Inf and NaN cannot be JSON encoded", 1);
RETURN_STRING("Inf and NaN cannot be JSON encoded");
case PHP_JSON_ERROR_UNSUPPORTED_TYPE:
RETURN_STRING("Type is not supported", 1);
RETURN_STRING("Type is not supported");
default:
RETURN_STRING("Unknown error", 1);
RETURN_STRING("Unknown error");
}
}
ext/json/tests/unsupported_type_error.phpt
+1 -1
View File
@@ -17,7 +17,7 @@ var_dump(json_last_error(), json_last_error_msg());
?>
--EXPECTF--
resource(5) of type (stream)
resource(%d) of type (stream)
bool(false)
int(8)
string(21) "Type is not supported"