Skip to content

Fix ip2long in AIX to treat IPs with leading zeros as invalid like LINUX #21296

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
reshmavk wants to merge 4 commits into
base: PHP-8.4
Choose a base branch
from
+12 −0
Open

Fix ip2long in AIX to treat IPs with leading zeros as invalid like LINUX #21296

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93ab5e9
Fix ip2long in AIX to treat IPs with leading zeros as invalid like LINUX
reshmavk Feb 25, 2026
268b698
Replace inet_ntoa with inet_ntop in ip2long
reshmavk Mar 12, 2026
1dc13d2
Modify indentation
reshmavk Mar 12, 2026
ca58557
Fix indentation
reshmavk Mar 13, 2026
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
12 changes: 12 additions & 0 deletions ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,18 @@ PHP_FUNCTION(ip2long)
if (addr_len == 0 || inet_pton(AF_INET, addr, &ip) != 1) {
RETURN_FALSE;
}
#ifdef _AIX
/*
AIX accepts IP strings with excedentary 0 (192.168.042.42 will be treated as
Copy link
Copy Markdown
Member

@devnexen devnexen May 4, 2026

Choose a reason for hiding this comment

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

nit: excedentary => extraneous.

192.168.42.42), while Linux don't.
Copy link
Copy Markdown
Member

@devnexen devnexen May 4, 2026

Choose a reason for hiding this comment

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

don't => doesn't

For consistency, we convert back the IP to a string and check if it is equal to
the original string. If not, the IP should be considered invalid.
*/
char str[INET_ADDRSTRLEN];
if (strcmp(addr, inet_ntop(AF_INET, &ip, str, sizeof(str))) != 0) {
Copy link
Copy Markdown
Member

@devnexen devnexen May 4, 2026

Choose a reason for hiding this comment

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

in theory inet_ntop should not fail since inet_pton is called above right ? I would prefer, however, assigning its result to a var and evaluating with a ZEND_ASSERT()

RETURN_FALSE;
}
#endif
RETURN_LONG(ntohl(ip.s_addr));
}
/* }}} */
Expand Down
Loading