Commit 3d3b1f6c96b for php
commit 3d3b1f6c96bb166b708f640079b442f73286bb63
Merge: f488c95a739 23cb773b5c0
Author: Daniel Scherzer <daniel.e.scherzer@gmail.com>
Date: Tue Nov 17 15:24:27 2026 -0800
Merge branch 'PHP-8.6'
* PHP-8.6:
[`%pS` migration] Use `%pS` in ext/curl (#23149)
diff --cc ext/curl/interface.c
index b94949b784c,144ae4aa044..9c5dd357d2c
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -1429,167 -1429,152 +1429,167 @@@ static inline CURLcode add_simple_field
return error;
}
-static inline zend_result build_mime_structure_from_hash(php_curl *ch, zval *zpostfields) /* {{{ */
+static inline CURLcode add_form_field(php_curl *ch, curl_mime *mime, zend_string *string_key, zval *current, zval *zpostfields)
{
- HashTable *postfields = Z_ARRVAL_P(zpostfields);
+ zend_string *postval;
CURLcode error = CURLE_OK;
- zval *current;
- zend_string *string_key;
- zend_ulong num_key;
- curl_mime *mime = NULL;
- curl_mimepart *part;
CURLcode form_error;
+ curl_mimepart *part;
- if (zend_hash_num_elements(postfields) > 0) {
- mime = curl_mime_init(ch->cp);
- if (mime == NULL) {
- return FAILURE;
- }
+ ZVAL_DEREF(current);
+
+ if (Z_TYPE_P(current) == IS_ARRAY) {
+ zend_type_error("%s(): Nested arrays are not supported for key %s", get_active_function_name(), ZSTR_VAL(string_key));
+ return CURLE_BAD_FUNCTION_ARGUMENT;
}
- ZEND_HASH_FOREACH_KEY_VAL(postfields, num_key, string_key, current) {
- zend_string *postval;
- /* Pretend we have a string_key here */
- if (!string_key) {
- string_key = zend_long_to_str(num_key);
+ if (Z_TYPE_P(current) == IS_OBJECT &&
+ instanceof_function(Z_OBJCE_P(current), curl_CURLFile_class)) {
+ /* new-style file upload */
+ zval *prop, rv;
+ char *type = NULL, *filename = NULL;
+ struct mime_data_cb_arg *cb_arg;
+ php_stream_statbuf ssb;
+ size_t filesize = -1;
+ curl_seek_callback seekfunc = seek_cb;
+
+ prop = zend_read_property_ex(curl_CURLFile_class, Z_OBJ_P(current), ZSTR_KNOWN(ZEND_STR_NAME), /* silent */ false, &rv);
+ ZVAL_DEREF(prop);
+ if (Z_TYPE_P(prop) != IS_STRING) {
- php_error_docref(NULL, E_WARNING, "Invalid filename for key %s", ZSTR_VAL(string_key));
++ php_error_docref(NULL, E_WARNING, "Invalid filename for key %pS", string_key);
} else {
- zend_string_addref(string_key);
- }
+ postval = Z_STR_P(prop);
- ZVAL_DEREF(current);
- if (Z_TYPE_P(current) == IS_OBJECT &&
- instanceof_function(Z_OBJCE_P(current), curl_CURLFile_class)) {
- /* new-style file upload */
- zval *prop, rv;
- char *type = NULL, *filename = NULL;
- struct mime_data_cb_arg *cb_arg;
- php_stream_statbuf ssb;
- size_t filesize = -1;
- curl_seek_callback seekfunc = seek_cb;
-
- prop = zend_read_property_ex(curl_CURLFile_class, Z_OBJ_P(current), ZSTR_KNOWN(ZEND_STR_NAME), /* silent */ false, &rv);
+ if (php_check_open_basedir(ZSTR_VAL(postval))) {
+ return CURLE_ABORTED_BY_CALLBACK;
+ }
+
+ prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);
ZVAL_DEREF(prop);
- if (Z_TYPE_P(prop) != IS_STRING) {
- php_error_docref(NULL, E_WARNING, "Invalid filename for key %pS", string_key);
- } else {
- postval = Z_STR_P(prop);
+ if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {
+ type = Z_STRVAL_P(prop);
+ }
+ prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "postname", sizeof("postname")-1, 0, &rv);
+ ZVAL_DEREF(prop);
+ if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {
+ filename = Z_STRVAL_P(prop);
+ }
- if (php_check_open_basedir(ZSTR_VAL(postval))) {
- goto out_string;
- }
+ zval_ptr_dtor(&ch->postfields);
+ ZVAL_COPY(&ch->postfields, zpostfields);
- prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);
- ZVAL_DEREF(prop);
- if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {
- type = Z_STRVAL_P(prop);
+ php_stream *stream;
+ if ((stream = php_stream_open_wrapper(ZSTR_VAL(postval), "rb", STREAM_MUST_SEEK, NULL))) {
+ if (!stream->readfilters.head && !php_stream_stat(stream, &ssb)) {
+ filesize = ssb.sb.st_size;
}
- prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "postname", sizeof("postname")-1, 0, &rv);
- ZVAL_DEREF(prop);
- if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {
- filename = Z_STRVAL_P(prop);
+ } else {
+ seekfunc = NULL;
+ }
+
+ part = curl_mime_addpart(mime);
+ if (part == NULL) {
+ if (stream) {
+ php_stream_close(stream);
}
+ return CURLE_OUT_OF_MEMORY;
+ }
- zval_ptr_dtor(&ch->postfields);
- ZVAL_COPY(&ch->postfields, zpostfields);
+ cb_arg = emalloc(sizeof *cb_arg);
+ cb_arg->filename = zend_string_copy(postval);
+ cb_arg->stream = stream;
- php_stream *stream;
- if ((stream = php_stream_open_wrapper(ZSTR_VAL(postval), "rb", STREAM_MUST_SEEK, NULL))) {
- if (!stream->readfilters.head && !php_stream_stat(stream, &ssb)) {
- filesize = ssb.sb.st_size;
- }
- } else {
- seekfunc = NULL;
- }
+ if ((form_error = curl_mime_name(part, ZSTR_VAL(string_key))) != CURLE_OK
+ || (form_error = curl_mime_data_cb(part, filesize, read_cb, seekfunc, free_cb, cb_arg)) != CURLE_OK
+ || (form_error = curl_mime_filename(part, filename ? filename : ZSTR_VAL(postval))) != CURLE_OK
+ || (form_error = curl_mime_type(part, type ? type : "application/octet-stream")) != CURLE_OK) {
+ error = form_error;
+ }
+ zend_llist_add_element(&ch->to_free->stream, &cb_arg);
+ }
- part = curl_mime_addpart(mime);
- if (part == NULL) {
- if (stream) {
- php_stream_close(stream);
- }
- goto out_string;
- }
+ return error;
+ }
- cb_arg = emalloc(sizeof *cb_arg);
- cb_arg->filename = zend_string_copy(postval);
- cb_arg->stream = stream;
+ if (Z_TYPE_P(current) == IS_OBJECT && instanceof_function(Z_OBJCE_P(current), curl_CURLStringFile_class)) {
+ /* new-style file upload from string */
+ zval *prop, rv;
+ char *type = NULL, *filename = NULL;
- if ((form_error = curl_mime_name(part, ZSTR_VAL(string_key))) != CURLE_OK
- || (form_error = curl_mime_data_cb(part, filesize, read_cb, seekfunc, free_cb, cb_arg)) != CURLE_OK
- || (form_error = curl_mime_filename(part, filename ? filename : ZSTR_VAL(postval))) != CURLE_OK
- || (form_error = curl_mime_type(part, type ? type : "application/octet-stream")) != CURLE_OK) {
- error = form_error;
- }
- zend_llist_add_element(&ch->to_free->stream, &cb_arg);
- }
+ prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "postname", sizeof("postname")-1, 0, &rv);
+ if (EG(exception)) {
+ return CURLE_BAD_FUNCTION_ARGUMENT;
+ }
+ ZVAL_DEREF(prop);
+ ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
- zend_string_release_ex(string_key, 0);
- continue;
+ filename = Z_STRVAL_P(prop);
+
+ prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);
+ if (EG(exception)) {
+ return CURLE_BAD_FUNCTION_ARGUMENT;
}
+ ZVAL_DEREF(prop);
+ ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
- if (Z_TYPE_P(current) == IS_OBJECT && instanceof_function(Z_OBJCE_P(current), curl_CURLStringFile_class)) {
- /* new-style file upload from string */
- zval *prop, rv;
- char *type = NULL, *filename = NULL;
+ type = Z_STRVAL_P(prop);
- prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "postname", sizeof("postname")-1, 0, &rv);
- if (EG(exception)) {
- goto out_string;
- }
- ZVAL_DEREF(prop);
- ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
+ prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "data", sizeof("data")-1, 0, &rv);
+ if (EG(exception)) {
+ return CURLE_BAD_FUNCTION_ARGUMENT;
+ }
+ ZVAL_DEREF(prop);
+ ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
- filename = Z_STRVAL_P(prop);
+ postval = Z_STR_P(prop);
- prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);
- if (EG(exception)) {
- goto out_string;
- }
- ZVAL_DEREF(prop);
- ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
+ zval_ptr_dtor(&ch->postfields);
+ ZVAL_COPY(&ch->postfields, zpostfields);
- type = Z_STRVAL_P(prop);
+ part = curl_mime_addpart(mime);
+ if (part == NULL) {
+ return CURLE_OUT_OF_MEMORY;
+ }
+ if ((form_error = curl_mime_name(part, ZSTR_VAL(string_key))) != CURLE_OK
+ || (form_error = curl_mime_data(part, ZSTR_VAL(postval), ZSTR_LEN(postval))) != CURLE_OK
+ || (form_error = curl_mime_filename(part, filename)) != CURLE_OK
+ || (form_error = curl_mime_type(part, type)) != CURLE_OK) {
+ error = form_error;
+ }
- prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "data", sizeof("data")-1, 0, &rv);
- if (EG(exception)) {
- goto out_string;
- }
- ZVAL_DEREF(prop);
- ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
+ return error;
+ }
- postval = Z_STR_P(prop);
+ return add_simple_field(mime, string_key, current);
+}
- zval_ptr_dtor(&ch->postfields);
- ZVAL_COPY(&ch->postfields, zpostfields);
- part = curl_mime_addpart(mime);
- if (part == NULL) {
- goto out_string;
- }
- if ((form_error = curl_mime_name(part, ZSTR_VAL(string_key))) != CURLE_OK
- || (form_error = curl_mime_data(part, ZSTR_VAL(postval), ZSTR_LEN(postval))) != CURLE_OK
- || (form_error = curl_mime_filename(part, filename)) != CURLE_OK
- || (form_error = curl_mime_type(part, type)) != CURLE_OK) {
- error = form_error;
- }
+static inline zend_result build_mime_structure_from_hash(php_curl *ch, zval *zpostfields) /* {{{ */
+{
+ HashTable *postfields = Z_ARRVAL_P(zpostfields);
+ CURLcode error = CURLE_OK;
+ zval *current;
+ zend_string *string_key;
+ zend_ulong num_key;
+ curl_mime *mime = NULL;
- zend_string_release_ex(string_key, 0);
- continue;
+ if (zend_hash_num_elements(postfields) > 0) {
+ mime = curl_mime_init(ch->cp);
+ if (mime == NULL) {
+ SAVE_CURL_ERROR(ch, CURLE_OUT_OF_MEMORY);
+ return FAILURE;
}
+ }
+
+ ZEND_HASH_FOREACH_KEY_VAL(postfields, num_key, string_key, current) {
+ /* Pretend we have a string_key here */
+ if (!string_key) {
+ string_key = zend_long_to_str(num_key);
+ } else {
+ zend_string_addref(string_key);
+ }
+
+ ZVAL_DEREF(current);
if (Z_TYPE_P(current) == IS_ARRAY) {
zval *current_element;