Use more appropriate types in JSON extension (php#8194)

Girgias · web-flow · commit ec53e17adf4f · 2022-03-16T22:53:41.000Z
Mainly zend_result
diff --git a/ext/json/json.c b/ext/json/json.c
@@ -141,10 +141,10 @@ static PHP_MINFO_FUNCTION(json)
 }
 /* }}} */
 
-PHP_JSON_API int php_json_encode_ex(smart_str *buf, zval *val, int options, zend_long depth) /* {{{ */
+PHP_JSON_API zend_result php_json_encode_ex(smart_str *buf, zval *val, int options, zend_long depth) /* {{{ */
 {
 	php_json_encoder encoder;
-	int return_code;
+	zend_result return_code;
 
 	php_json_encode_init(&encoder);
 	encoder.max_depth = depth;
@@ -156,7 +156,7 @@ PHP_JSON_API int php_json_encode_ex(smart_str *buf, zval *val, int options, zend
 }
 /* }}} */
 
-PHP_JSON_API int php_json_encode(smart_str *buf, zval *val, int options) /* {{{ */
+PHP_JSON_API zend_result php_json_encode(smart_str *buf, zval *val, int options) /* {{{ */
 {
 	return php_json_encode_ex(buf, val, options, JSON_G(encode_max_depth));
 }
@@ -195,7 +195,7 @@ static const char *php_json_get_error_msg(php_json_error_code error_code) /* {{{
 }
 /* }}} */
 
-PHP_JSON_API int php_json_decode_ex(zval *return_value, const char *str, size_t str_len, zend_long options, zend_long depth) /* {{{ */
+PHP_JSON_API zend_result php_json_decode_ex(zval *return_value, const char *str, size_t str_len, zend_long options, zend_long depth) /* {{{ */
 {
 	php_json_parser parser;
 
diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c
@@ -31,7 +31,7 @@
 
 static const char digits[] = "0123456789abcdef";
 
-static int php_json_escape_string(
+static zend_result php_json_escape_string(
 		smart_str *buf,	const char *s, size_t len,
 		int options, php_json_encoder *encoder);
 
@@ -71,7 +71,7 @@ static inline void php_json_pretty_print_indent(smart_str *buf, int options, php
 
 /* }}} */
 
-static inline int php_json_is_valid_double(double d) /* {{{ */
+static inline bool php_json_is_valid_double(double d) /* {{{ */
 {
 	return !zend_isinf(d) && !zend_isnan(d);
 }
@@ -107,7 +107,7 @@ static inline void php_json_encode_double(smart_str *buf, double d, int options)
 		} \
 	} while (0)
 
-static int php_json_encode_array(smart_str *buf, zval *val, int options, php_json_encoder *encoder) /* {{{ */
+static zend_result php_json_encode_array(smart_str *buf, zval *val, int options, php_json_encoder *encoder) /* {{{ */
 {
 	int i, r, need_comma = 0;
 	HashTable *myht, *prop_ht;
@@ -312,7 +312,7 @@ static int php_json_encode_array(smart_str *buf, zval *val, int options, php_jso
 }
 /* }}} */
 
-static int php_json_escape_string(
+static zend_result php_json_escape_string(
 		smart_str *buf, const char *s, size_t len,
 		int options, php_json_encoder *encoder) /* {{{ */
 {
@@ -525,12 +525,12 @@ static int php_json_escape_string(
 }
 /* }}} */
 
-static int php_json_encode_serializable_object(smart_str *buf, zval *val, int options, php_json_encoder *encoder) /* {{{ */
+static zend_result php_json_encode_serializable_object(smart_str *buf, zval *val, int options, php_json_encoder *encoder) /* {{{ */
 {
 	zend_class_entry *ce = Z_OBJCE_P(val);
 	HashTable* myht = Z_OBJPROP_P(val);
 	zval retval, fname;
-	int return_code;
+	zend_result return_code;
 
 	if (myht && GC_IS_RECURSIVE(myht)) {
 		encoder->error_code = PHP_JSON_ERROR_RECURSION;
@@ -587,7 +587,7 @@ static int php_json_encode_serializable_object(smart_str *buf, zval *val, int op
 }
 /* }}} */
 
-static int php_json_encode_serializable_enum(smart_str *buf, zval *val, int options, php_json_encoder *encoder)
+static zend_result php_json_encode_serializable_enum(smart_str *buf, zval *val, int options, php_json_encoder *encoder)
 {
 	zend_class_entry *ce = Z_OBJCE_P(val);
 	if (ce->enum_backing_type == IS_UNDEF) {
@@ -600,7 +600,7 @@ static int php_json_encode_serializable_enum(smart_str *buf, zval *val, int opti
 	return php_json_encode_zval(buf, value_zv, options, encoder);
 }
 
-int php_json_encode_zval(smart_str *buf, zval *val, int options, php_json_encoder *encoder) /* {{{ */
+zend_result php_json_encode_zval(smart_str *buf, zval *val, int options, php_json_encoder *encoder) /* {{{ */
 {
 again:
 	switch (Z_TYPE_P(val))
diff --git a/ext/json/php_json.h b/ext/json/php_json.h
@@ -97,11 +97,11 @@ PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json)
 ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
-PHP_JSON_API int php_json_encode_ex(smart_str *buf, zval *val, int options, zend_long depth);
-PHP_JSON_API int php_json_encode(smart_str *buf, zval *val, int options);
-PHP_JSON_API int php_json_decode_ex(zval *return_value, const char *str, size_t str_len, zend_long options, zend_long depth);
+PHP_JSON_API zend_result php_json_encode_ex(smart_str *buf, zval *val, int options, zend_long depth);
+PHP_JSON_API zend_result php_json_encode(smart_str *buf, zval *val, int options);
+PHP_JSON_API zend_result php_json_decode_ex(zval *return_value, const char *str, size_t str_len, zend_long options, zend_long depth);
 
-static inline int php_json_decode(zval *return_value, const char *str, int str_len, bool assoc, zend_long depth)
+static inline zend_result php_json_decode(zval *return_value, const char *str, size_t str_len, bool assoc, zend_long depth)
 {
 	return php_json_decode_ex(return_value, str, str_len, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0, depth);
 }
diff --git a/ext/json/php_json_encoder.h b/ext/json/php_json_encoder.h
@@ -33,6 +33,6 @@ static inline void php_json_encode_init(php_json_encoder *encoder)
 	memset(encoder, 0, sizeof(php_json_encoder));
 }
 
-int php_json_encode_zval(smart_str *buf, zval *val, int options, php_json_encoder *encoder);
+zend_result php_json_encode_zval(smart_str *buf, zval *val, int options, php_json_encoder *encoder);
 
 #endif	/* PHP_JSON_ENCODER_H */

Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,10 @@ static PHP_MINFO_FUNCTION(json)`
`141`	`141`	`}`
`142`	`142`	`/* }}} */`
`143`	`143`
`144`		`-PHP_JSON_API int php_json_encode_ex(smart_str buf, zval val, int options, zend_long depth) /* {{{ */`
	`144`	`+PHP_JSON_API zend_result php_json_encode_ex(smart_str buf, zval val, int options, zend_long depth) /* {{{ */`
`145`	`145`	`{`
`146`	`146`	`php_json_encoder encoder;`
`147`		`- int return_code;`
	`147`	`+ zend_result return_code;`
`148`	`148`
`149`	`149`	`php_json_encode_init(&encoder);`
`150`	`150`	`encoder.max_depth = depth;`
`@@ -156,7 +156,7 @@ PHP_JSON_API int php_json_encode_ex(smart_str buf, zval val, int options, zend`
`156`	`156`	`}`
`157`	`157`	`/* }}} */`
`158`	`158`
`159`		`-PHP_JSON_API int php_json_encode(smart_str buf, zval val, int options) /* {{{ */`
	`159`	`+PHP_JSON_API zend_result php_json_encode(smart_str buf, zval val, int options) /* {{{ */`
`160`	`160`	`{`
`161`	`161`	`return php_json_encode_ex(buf, val, options, JSON_G(encode_max_depth));`
`162`	`162`	`}`
`@@ -195,7 +195,7 @@ static const char php_json_get_error_msg(php_json_error_code error_code) / {{{`
`195`	`195`	`}`
`196`	`196`	`/* }}} */`
`197`	`197`
`198`		`-PHP_JSON_API int php_json_decode_ex(zval return_value, const char str, size_t str_len, zend_long options, zend_long depth) /* {{{ */`
	`198`	`+PHP_JSON_API zend_result php_json_decode_ex(zval return_value, const char str, size_t str_len, zend_long options, zend_long depth) /* {{{ */`
`199`	`199`	`{`
`200`	`200`	`php_json_parser parser;`
`201`	`201`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`
`32`	`32`	`static const char digits[] = "0123456789abcdef";`
`33`	`33`
`34`		`-static int php_json_escape_string(`
	`34`	`+static zend_result php_json_escape_string(`
`35`	`35`	`smart_str buf, const char s, size_t len,`
`36`	`36`	`int options, php_json_encoder *encoder);`
`37`	`37`
`@@ -71,7 +71,7 @@ static inline void php_json_pretty_print_indent(smart_str *buf, int options, php`
`71`	`71`
`72`	`72`	`/* }}} */`
`73`	`73`
`74`		`-static inline int php_json_is_valid_double(double d) /* {{{ */`
	`74`	`+static inline bool php_json_is_valid_double(double d) /* {{{ */`
`75`	`75`	`{`
`76`	`76`	`return !zend_isinf(d) && !zend_isnan(d);`
`77`	`77`	`}`
`@@ -107,7 +107,7 @@ static inline void php_json_encode_double(smart_str *buf, double d, int options)`
`107`	`107`	`} \`
`108`	`108`	`} while (0)`
`109`	`109`
`110`		`-static int php_json_encode_array(smart_str buf, zval val, int options, php_json_encoder encoder) / {{{ */`
	`110`	`+static zend_result php_json_encode_array(smart_str buf, zval val, int options, php_json_encoder encoder) / {{{ */`
`111`	`111`	`{`
`112`	`112`	`int i, r, need_comma = 0;`
`113`	`113`	`HashTable myht, prop_ht;`
`@@ -312,7 +312,7 @@ static int php_json_encode_array(smart_str buf, zval val, int options, php_jso`
`312`	`312`	`}`
`313`	`313`	`/* }}} */`
`314`	`314`
`315`		`-static int php_json_escape_string(`
	`315`	`+static zend_result php_json_escape_string(`
`316`	`316`	`smart_str buf, const char s, size_t len,`
`317`	`317`	`int options, php_json_encoder encoder) / {{{ */`
`318`	`318`	`{`
`@@ -525,12 +525,12 @@ static int php_json_escape_string(`
`525`	`525`	`}`
`526`	`526`	`/* }}} */`
`527`	`527`
`528`		`-static int php_json_encode_serializable_object(smart_str buf, zval val, int options, php_json_encoder encoder) / {{{ */`
	`528`	`+static zend_result php_json_encode_serializable_object(smart_str buf, zval val, int options, php_json_encoder encoder) / {{{ */`
`529`	`529`	`{`
`530`	`530`	`zend_class_entry *ce = Z_OBJCE_P(val);`
`531`	`531`	`HashTable* myht = Z_OBJPROP_P(val);`
`532`	`532`	`zval retval, fname;`
`533`		`- int return_code;`
	`533`	`+ zend_result return_code;`
`534`	`534`
`535`	`535`	`if (myht && GC_IS_RECURSIVE(myht)) {`
`536`	`536`	`encoder->error_code = PHP_JSON_ERROR_RECURSION;`
`@@ -587,7 +587,7 @@ static int php_json_encode_serializable_object(smart_str buf, zval val, int op`
`587`	`587`	`}`
`588`	`588`	`/* }}} */`
`589`	`589`
`590`		`-static int php_json_encode_serializable_enum(smart_str buf, zval val, int options, php_json_encoder *encoder)`
	`590`	`+static zend_result php_json_encode_serializable_enum(smart_str buf, zval val, int options, php_json_encoder *encoder)`
`591`	`591`	`{`
`592`	`592`	`zend_class_entry *ce = Z_OBJCE_P(val);`
`593`	`593`	`if (ce->enum_backing_type == IS_UNDEF) {`
`@@ -600,7 +600,7 @@ static int php_json_encode_serializable_enum(smart_str buf, zval val, int opti`
`600`	`600`	`return php_json_encode_zval(buf, value_zv, options, encoder);`
`601`	`601`	`}`
`602`	`602`
`603`		`-int php_json_encode_zval(smart_str buf, zval val, int options, php_json_encoder encoder) / {{{ */`
	`603`	`+zend_result php_json_encode_zval(smart_str buf, zval val, int options, php_json_encoder encoder) / {{{ */`
`604`	`604`	`{`
`605`	`605`	`again:`
`606`	`606`	`switch (Z_TYPE_P(val))`
Original file line number	Diff line number	Diff line change
`@@ -97,11 +97,11 @@ PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json)`
`97`	`97`	`ZEND_TSRMLS_CACHE_EXTERN()`
`98`	`98`	`#endif`
`99`	`99`
`100`		`-PHP_JSON_API int php_json_encode_ex(smart_str buf, zval val, int options, zend_long depth);`
`101`		`-PHP_JSON_API int php_json_encode(smart_str buf, zval val, int options);`
`102`		`-PHP_JSON_API int php_json_decode_ex(zval return_value, const char str, size_t str_len, zend_long options, zend_long depth);`
	`100`	`+PHP_JSON_API zend_result php_json_encode_ex(smart_str buf, zval val, int options, zend_long depth);`
	`101`	`+PHP_JSON_API zend_result php_json_encode(smart_str buf, zval val, int options);`
	`102`	`+PHP_JSON_API zend_result php_json_decode_ex(zval return_value, const char str, size_t str_len, zend_long options, zend_long depth);`
`103`	`103`
`104`		`-static inline int php_json_decode(zval return_value, const char str, int str_len, bool assoc, zend_long depth)`
	`104`	`+static inline zend_result php_json_decode(zval return_value, const char str, size_t str_len, bool assoc, zend_long depth)`
`105`	`105`	`{`
`106`	`106`	`return php_json_decode_ex(return_value, str, str_len, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0, depth);`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ static inline void php_json_encode_init(php_json_encoder *encoder)`
`33`	`33`	`memset(encoder, 0, sizeof(php_json_encoder));`
`34`	`34`	`}`
`35`	`35`
`36`		`-int php_json_encode_zval(smart_str buf, zval val, int options, php_json_encoder *encoder);`
	`36`	`+zend_result php_json_encode_zval(smart_str buf, zval val, int options, php_json_encoder *encoder);`
`37`	`37`
`38`	`38`	`#endif /* PHP_JSON_ENCODER_H */`