From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 23 Jul 2017 17:09:36 +0000 (+0200)
Subject: Remove more obsolete length checks
X-Git-Tag: php-7.3.0alpha1~1813
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bff11c382eaf196e709ed51f757a0b7b6e3eea28;p=php

Remove more obsolete length checks
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 92741a2354..58556410d1 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2885,13 +2885,6 @@ PHP_FUNCTION(mb_substr)
 		RETURN_FALSE;
 	}
 
-	if (from > INT_MAX) {
-		from = INT_MAX;
-	}
-	if (len > INT_MAX) {
-		len = INT_MAX;
-	}
-
 	ret = mbfl_substr(&string, &result, from, len);
 	if (NULL == ret) {
 		RETURN_FALSE;
@@ -3639,23 +3632,15 @@ PHP_FUNCTION(mb_encode_mimeheader)
 PHP_FUNCTION(mb_decode_mimeheader)
 {
 	mbfl_string string, result, *ret;
-	size_t string_len;
 
 	mbfl_string_init(&string);
 	string.no_language = MBSTRG(language);
 	string.encoding = MBSTRG(current_internal_encoding);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", (char **)&string.val, &string_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", (char **)&string.val, &string.len) == FAILURE) {
 		return;
 	}
 
-	if (ZEND_SIZE_T_UINT_OVFL(string_len)) {
-			php_error_docref(NULL, E_WARNING, "String length overflows the max allowed length of %u", UINT_MAX);
-			return;
-	}
-
-	string.len = (uint32_t)string_len;
-
 	mbfl_string_init(&result);
 	ret = mbfl_mime_header_decode(&string, &result, MBSTRG(current_internal_encoding));
 	if (ret != NULL) {