Skip to content

ext/sockets: multicast socket option helper change to zval_try_get_tm… #17871

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

Merged
merged 1 commit into from
Feb 20, 2025
Merged

ext/sockets: multicast socket option helper change to zval_try_get_tm… #17871

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
10 changes: 8 additions & 2 deletions ext/sockets/multicast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ static zend_result php_get_if_index_from_zval(zval *val, unsigned *out)
ret = SUCCESS;
} else {
zend_string *tmp_str;
zend_string *str = zval_get_tmp_string(val, &tmp_str);
zend_string *str = zval_try_get_tmp_string(val, &tmp_str);
if (UNEXPECTED(!str)) {
return FAILURE;
}
ret = php_string_to_if_index(ZSTR_VAL(str), out);
zend_tmp_string_release(tmp_str);
}
Expand Down Expand Up @@ -127,7 +130,10 @@ static zend_result php_get_address_from_array(const HashTable *ht, const char *k
zend_value_error("No key \"%s\" passed in optval", key);
return FAILURE;
}
str = zval_get_tmp_string(val, &tmp_str);
str = zval_try_get_tmp_string(val, &tmp_str);
if (UNEXPECTED(!str)) {
return FAILURE;
}
if (!php_set_inet46_addr(ss, ss_len, str, sock)) {
zend_tmp_string_release(tmp_str);
return FAILURE;
Expand Down
Loading