Skip to content

ext/curl: accept SensitiveParameterValue in curl_setopt #22960

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

Draft
Sjord wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −0
Draft

ext/curl: accept SensitiveParameterValue in curl_setopt #22960

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
17 changes: 17 additions & 0 deletions ext/curl/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1625,6 +1625,23 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
CURLcode error = CURLE_OK;
zend_long lval;

if (Z_TYPE_P(zvalue) == IS_OBJECT
&& instanceof_function(Z_OBJCE_P(zvalue), zend_ce_sensitive_parameter_value))

@TimWolla TimWolla Jul 31, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for instanceof, SensitiveParameterValue is final. You can just compare the CE directly.

{
zval rv;

@TimWolla TimWolla Jul 31, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This theoretically leaks rv. But we know that SensitiveParameterValue is final and has a real backing store for the property and &rv is unused. I would therefore suggest to just pass NULL instead of &rv.

zval *inner_value;

inner_value = zend_read_property_ex(
zend_ce_sensitive_parameter_value,

@TimWolla TimWolla Jul 31, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
zend_ce_sensitive_parameter_value,
Z_OBJCE_P(zvalue),

@DanielEScherzer DanielEScherzer Aug 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I disagree with the suggestion - why do a lookup when we know the class type?

Z_OBJ_P(zvalue),
ZSTR_KNOWN(ZEND_STR_VALUE),
0,
&rv
);

zvalue = inner_value;
}

switch (option) {
/* Callable options */
HANDLE_CURL_OPTION_CALLABLE_PHP_CURL_USER(ch, CURLOPT_WRITE, write, PHP_CURL_STDOUT);
Expand Down
Loading