Skip to content

Commit 06d874f

Browse files
committed
DNS review
1 parent 301150a commit 06d874f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ext/standard/dns.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ PHP_FUNCTION(gethostbyname)
213213

214214
if (hostname_len > MAXFQDNLEN) {
215215
/* name too long, protect from CVE-2015-0235 */
216-
zend_argument_value_error(1, "must be less than %d characters", MAXFQDNLEN);
216+
zend_argument_value_error(1, "cannot be longer than %d characters", MAXFQDNLEN);
217217
RETURN_THROWS();
218218
}
219219

@@ -236,7 +236,7 @@ PHP_FUNCTION(gethostbynamel)
236236

237237
if (hostname_len > MAXFQDNLEN) {
238238
/* name too long, protect from CVE-2015-0235 */
239-
zend_argument_value_error(1, "must be less than %d characters", MAXFQDNLEN);
239+
zend_argument_value_error(1, "cannot be longer than %d characters", MAXFQDNLEN);
240240
RETURN_THROWS();
241241
}
242242

@@ -845,7 +845,7 @@ PHP_FUNCTION(dns_get_record)
845845
}
846846
} else {
847847
if ((type_param < 1) || (type_param > 0xFFFF)) {
848-
zend_argument_value_error(2, "must be between 1 and 65535 when Argument #5 ($raw) is true");
848+
zend_argument_value_error(2, "must be between 1 and 65535 when argument #5 ($raw) is true");
849849
RETURN_THROWS();
850850
}
851851
}

ext/standard/tests/network/bug68925.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ try {
1515

1616
?>
1717
--EXPECT--
18-
gethostbyname(): Argument #1 ($hostname) must be less than 255 characters
19-
gethostbynamel(): Argument #1 ($hostname) must be less than 255 characters
18+
gethostbyname(): Argument #1 ($hostname) cannot be longer than 255 characters
19+
gethostbynamel(): Argument #1 ($hostname) cannot be longer than 255 characters

0 commit comments

Comments
 (0)