X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_message_body.c;h=518dbc9b71ef34b57362a63463a2f100c7d5e3b7;hp=526c233f18af4a3aebaabfcb1f7d4ba49f52063f;hb=a81472d0108d16e680980a9e0c1b4af0d629c43a;hpb=377d576a6e68def5708cf1ffcd3c233c4dddf356 diff --git a/src/php_http_message_body.c b/src/php_http_message_body.c index 526c233..518dbc9 100644 --- a/src/php_http_message_body.c +++ b/src/php_http_message_body.c @@ -262,9 +262,14 @@ void php_http_message_body_add_part(php_http_message_body_t *body, php_http_mess ZEND_RESULT_CODE php_http_message_body_add_form_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len) { - zend_string *safe_name = zend_string_init(name, strlen(name), 0); + zend_string *safe_name, *zstr_name = zend_string_init(name, strlen(name), 0); - safe_name = php_addslashes(safe_name, 1); +#if PHP_VERSION_ID < 70300 + safe_name = php_addslashes(zstr_name, 1); +#else + safe_name = php_addslashes(zstr_name); + zend_string_release_ex(zstr_name, 0); +#endif BOUNDARY_OPEN(body); php_http_message_body_appendf( @@ -284,9 +289,14 @@ ZEND_RESULT_CODE php_http_message_body_add_form_file(php_http_message_body_t *bo { size_t path_len = strlen(path); char *path_dup = estrndup(path, path_len); - zend_string *base_name, *safe_name = zend_string_init(name, strlen(name), 0); - - safe_name = php_addslashes(safe_name, 1); + zend_string *base_name, *safe_name, *zstr_name = zend_string_init(name, strlen(name), 0); + +#if PHP_VERSION_ID < 70300 + safe_name = php_addslashes(zstr_name, 1); +#else + safe_name = php_addslashes(zstr_name); + zend_string_release_ex(zstr_name, 0); +#endif base_name = php_basename(path_dup, path_len, NULL, 0); BOUNDARY_OPEN(body);