Skip to content

ext/standard: inet_ntop internal change. #17830

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ext/standard: inet_ntop internal change. #17830

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54de51f
ext/standard: inet_ntop internal change.
devnexen Feb 16, 2025
02adec8
taking the reverse stance in term of buffer size/socket family relation
devnexen Feb 17, 2025
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
9 changes: 6 additions & 3 deletions ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,8 @@ PHP_FUNCTION(inet_ntop)
char *address;
size_t address_len;
int af = AF_INET;
char buffer[40];
socklen_t buffersize = INET6_ADDRSTRLEN;
char buffer[INET6_ADDRSTRLEN];
Copy link
Contributor

Choose a reason for hiding this comment

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

Is anything INET6_* defined when HAVE_IPV6 is not?

Also, is it safe to use shorter buffersize when compiled /wo IPv6 support and then run on system /w IPv6 support?

Copy link
Member Author

Choose a reason for hiding this comment

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

Is anything INET6_* defined when HAVE_IPV6 is not?

Yes it is independant from ipv6 support and, alone, does not indicate the system supports it.

Also, is it safe to use shorter buffersize when compiled /wo IPv6 support and then run on system /w IPv6 support?

Yes in that case the best course is to reverse the logic.


ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_STRING(address, address_len)
Expand All @@ -555,11 +556,13 @@ PHP_FUNCTION(inet_ntop)
af = AF_INET6;
} else
#endif
if (address_len != 4) {
if (address_len == 4) {
buffersize = INET_ADDRSTRLEN;
} else {
RETURN_FALSE;
}

if (!inet_ntop(af, address, buffer, sizeof(buffer))) {
if (!inet_ntop(af, address, buffer, buffersize)) {
RETURN_FALSE;
}

Expand Down
Loading