com php-src: Remove more obsolete length checks: ext/mbstring/mbstring.c

From: Date: Sun, 23 Jul 2017 17:09:36 +0000
Subject: com php-src: Remove more obsolete length checks: ext/mbstring/mbstring.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98759@lists.php.net to get a copy of this message
Commit: bff11c382eaf196e709ed51f757a0b7b6e3eea28 Author: Nikita Popov <nikita.ppv@gmail.com> Sun, 23 Jul 2017 19:09:36 +0200 Parents: 3c6b2512cb24dfe8896d88115ba7468e7392809b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bff11c382eaf196e709ed51f757a0b7b6e3eea28 Log: Remove more obsolete length checks Changed paths: M ext/mbstring/mbstring.c Diff: diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 92741a2..5855641 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) {

« previous php.cvs (#98759) next »