tweak

ndossche · ndossche · commit 5df25a45ca6c · 2025-02-05T20:21:17.000+01:00
diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c
@@ -374,8 +374,7 @@ static zend_result php_json_encode_array(smart_str *buf, zval *val, int options,
 }
 /* }}} */
 
-/* Outlined smart_str_appendl() to avoid performance loss due to code bloat */
-// TODO: now I don't outline it anymore...
+/* Specialization of smart_str_appendl() to avoid performance loss due to code bloat */
 static zend_always_inline void php_json_append(smart_str *dest, const char *src, size_t len)
 {
 	/* smart_str has a minimum size of the input length,
@@ -387,6 +386,8 @@ static zend_always_inline void php_json_append(smart_str *dest, const char *src,
 
 static zend_always_inline bool php_json_printable_ascii_escape(smart_str *buf, unsigned char us, int options)
 {
+	ZEND_ASSERT(buf->s);
+
 	switch (us) {
 		case '"':
 			if (options & PHP_JSON_HEX_QUOT) {

Original file line number	Diff line number	Diff line change
`@@ -374,8 +374,7 @@ static zend_result php_json_encode_array(smart_str buf, zval val, int options,`
`374`	`374`	`}`
`375`	`375`	`/* }}} */`
`376`	`376`
`377`		`-/* Outlined smart_str_appendl() to avoid performance loss due to code bloat */`
`378`		`-// TODO: now I don't outline it anymore...`
	`377`	`+/* Specialization of smart_str_appendl() to avoid performance loss due to code bloat */`
`379`	`378`	`static zend_always_inline void php_json_append(smart_str dest, const char src, size_t len)`
`380`	`379`	`{`
`381`	`380`	`/* smart_str has a minimum size of the input length,`
`@@ -387,6 +386,8 @@ static zend_always_inline void php_json_append(smart_str dest, const char src,`
`387`	`386`
`388`	`387`	`static zend_always_inline bool php_json_printable_ascii_escape(smart_str *buf, unsigned char us, int options)`
`389`	`388`	`{`
	`389`	`+ ZEND_ASSERT(buf->s);`
	`390`	`+`
`390`	`391`	`switch (us) {`
`391`	`392`	`case '"':`
`392`	`393`	`if (options & PHP_JSON_HEX_QUOT) {`