archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix datatype mismatches

Browse source
This commit is contained in:
Anatol Belski 2015-03-25 10:59:05 +01:00
parent 0ae011f3a7
commit fe36285de2
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/json/json_encoder.c
View file

@ -104,7 +104,7 @@ static inline void php_json_encode_double(smart_str *buf, double d, int options)
{ {
size_t len; size_t len;
char num[PHP_JSON_DOUBLE_MAX_LENGTH]; char num[PHP_JSON_DOUBLE_MAX_LENGTH];
php_gcvt(d, EG(precision), '.', 'e', &num[0]); php_gcvt(d, (int)EG(precision), '.', 'e', &num[0]);
len = strlen(num); len = strlen(num);
if (options & PHP_JSON_PRESERVE_ZERO_FRACTION && strchr(num, '.') == NULL && len < PHP_JSON_DOUBLE_MAX_LENGTH - 2) { if (options & PHP_JSON_PRESERVE_ZERO_FRACTION && strchr(num, '.') == NULL && len < PHP_JSON_DOUBLE_MAX_LENGTH - 2) {
num[len++] = '.'; num[len++] = '.';

2
ext/json/json_parser.tab.c
View file

@ -1817,7 +1817,7 @@ void php_json_parser_object_init(php_json_parser *parser, zval *object)
void php_json_parser_object_update(php_json_parser *parser, zval *object, zval *zkey, zval *zvalue) void php_json_parser_object_update(php_json_parser *parser, zval *object, zval *zkey, zval *zvalue)
{ {
char *key = Z_STRVAL_P(zkey); char *key = Z_STRVAL_P(zkey);
int key_len = Z_STRLEN_P(zkey); size_t key_len = Z_STRLEN_P(zkey);
if (parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY) { if (parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY) {
add_assoc_zval_ex(object, key, key_len, zvalue); add_assoc_zval_ex(object, key, key_len, zvalue);

2
ext/json/json_parser.y
View file

@ -188,7 +188,7 @@ void php_json_parser_object_init(php_json_parser *parser, zval *object)
void php_json_parser_object_update(php_json_parser *parser, zval *object, zval *zkey, zval *zvalue) void php_json_parser_object_update(php_json_parser *parser, zval *object, zval *zkey, zval *zvalue)
{ {
char *key = Z_STRVAL_P(zkey); char *key = Z_STRVAL_P(zkey);
int key_len = Z_STRLEN_P(zkey); size_t key_len = Z_STRLEN_P(zkey);
if (parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY) { if (parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY) {
add_assoc_zval_ex(object, key, key_len, zvalue); add_assoc_zval_ex(object, key, key_len, zvalue);