php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1'

Browse Source 
* PHP-7.1:
  Follow up patch regarding bug #74216, see bug #74429
This commit is contained in:
Anatol Belski
2017-04-25 13:00:10 +02:00
parent eb68c0d525 faf19a7756
commit bbf0a9d8a7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/streams/xp_socket.c
View File

@@ -581,7 +581,7 @@ static inline char *parse_ip_address_ex(const char *str, size_t str_len, int *po
return NULL;
}
*portno = strtol(p + 2, &e, 10);
if (e && *e) {
if (e && *e && *e != '/') {
if (get_err) {
*err = strpprintf(0, "Failed to parse address \"%s\"", str);
}
@@ -600,7 +600,7 @@ static inline char *parse_ip_address_ex(const char *str, size_t str_len, int *po
if (colon) {
char *e = NULL;
*portno = strtol(colon + 1, &e, 10);
if (!e || !*e) {
if (!e || !*e || *e == '/') {
return estrndup(str, colon - str);
}
}