Skip to content

ext/curl: Propagate multipart field construction errors #24434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iliaal wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+10 −2
Open

ext/curl: Propagate multipart field construction errors #24434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ PHP NEWS
so an in-process engine restart keeps growing the map_ptr table).
(David Carlier)

- Curl:
. Fixed curl_setopt() ignoring errors while building multipart POST fields.
(Ilia Alshanetsky)

- Date:
. Fixed bug GH-20503 (Assertion failure with ext/date DateInterval property
hash construction). (heathdutton)
Expand Down
8 changes: 6 additions & 2 deletions ext/curl/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,14 +1574,18 @@ static inline zend_result build_mime_structure_from_hash(php_curl *ch, zval *zpo
zval *current_element;

ZEND_HASH_FOREACH_VAL(HASH_OF(current), current_element) {
add_simple_field(mime, string_key, current_element);
if ((form_error = add_simple_field(mime, string_key, current_element)) != CURLE_OK && error == CURLE_OK) {
error = form_error;
}
} ZEND_HASH_FOREACH_END();

zend_string_release_ex(string_key, 0);
continue;
}

add_simple_field(mime, string_key, current);
if ((form_error = add_simple_field(mime, string_key, current)) != CURLE_OK && error == CURLE_OK) {
error = form_error;
}

zend_string_release_ex(string_key, 0);
} ZEND_HASH_FOREACH_END();
Expand Down
Loading