diff options
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index df02927d0a..e1943df847 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -451,10 +451,37 @@ static PHP_FUNCTION(json_decode) } else { + double d; + int type; + long p; + zval_dtor(z); FREE_ZVAL(z); efree(utf16); - RETURN_NULL(); + + if (parameter_len == 4) { + if (!strcasecmp(parameter, "null")) { + RETURN_NULL(); + } else if (!strcasecmp(parameter, "true")) { + RETURN_BOOL(1); + } + } else if (parameter_len == 5 && !strcasecmp(parameter, "false")) { + RETURN_BOOL(0); + } + if ((type = is_numeric_string(parameter, parameter_len, &p, &d, 0)) != 0) { + if (type == IS_LONG) { + RETURN_LONG(p); + } else if (type == IS_DOUBLE) { + RETURN_DOUBLE(d); + } + } + if (*parameter == '"' && parameter[parameter_len-1] == '"') { + RETURN_STRINGL(parameter+1, parameter_len-2, 1); + } else if (*parameter == '{' || *parameter == '[') { /* invalid JSON string */ + RETURN_NULL(); + } else { + RETURN_STRINGL(parameter, parameter_len, 1); + } } } |