com php-src: Fix for bug #72782: mcrypt accepts only ints, so don't pass anything else: ext/mcrypt/mcrypt.c

From: Date: Wed, 17 Aug 2016 09:31:41 +0000
Subject: com php-src: Fix for bug #72782: mcrypt accepts only ints, so don't pass anything else: ext/mcrypt/mcrypt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93904@lists.php.net to get a copy of this message
Commit: 5ba1cbec0784636faeb7a527dbc1510f61bd5732 Author: Stanislav Malyshev <stas@php.net> Wed, 10 Aug 2016 22:33:18 -0700 Committer: Anatol Belski <ab@php.net> Wed, 17 Aug 2016 11:31:41 +0200 Parents: 326ac100ac016cd5fc2c7367c97d64fa4b6932df Branches: PHP-7.0.10 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5ba1cbec0784636faeb7a527dbc1510f61bd5732 Log: Fix for bug #72782: mcrypt accepts only ints, so don't pass anything else (cherry picked from commit 4f6a97f5321ef617b98a1f79aac1ad447d13b2b4) Bugs: https://bugs.php.net/72782 Changed paths: M ext/mcrypt/mcrypt.c Diff: diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 73acaa2..9865cbb 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -633,6 +633,10 @@ PHP_FUNCTION(mcrypt_generic) RETURN_FALSE } + if (data_len > INT_MAX) { + php_error_docref(NULL, E_WARNING, "Data size too large, %d maximum", INT_MAX); + RETURN_FALSE; + } /* Check blocksize */ if (mcrypt_enc_is_block_mode(pm->td) == 1) { /* It's a block algorithm */ block_size = mcrypt_enc_get_block_size(pm->td); @@ -645,10 +649,6 @@ PHP_FUNCTION(mcrypt_generic) memset(ZSTR_VAL(data_str), 0, data_size); memcpy(ZSTR_VAL(data_str), data, data_len); } else { /* It's not a block algorithm */ - if (data_len > INT_MAX) { - php_error_docref(NULL, E_WARNING, "Data size too large, %d maximum", INT_MAX); - RETURN_FALSE; - } data_size = (int)data_len; data_str = zend_string_alloc(data_size, 0); memset(ZSTR_VAL(data_str), 0, data_size); @@ -688,6 +688,10 @@ PHP_FUNCTION(mdecrypt_generic) } /* Check blocksize */ + if (data_len > INT_MAX) { + php_error_docref(NULL, E_WARNING, "Data size too large, %d maximum", INT_MAX); + RETURN_FALSE; + } if (mcrypt_enc_is_block_mode(pm->td) == 1) { /* It's a block algorithm */ block_size = mcrypt_enc_get_block_size(pm->td); data_size = ((((int)data_len - 1) / block_size) + 1) * block_size; @@ -699,10 +703,6 @@ PHP_FUNCTION(mdecrypt_generic) memset(data_s, 0, data_size); memcpy(data_s, data, data_len); } else { /* It's not a block algorithm */ - if (data_len > INT_MAX) { - php_error_docref(NULL, E_WARNING, "Data size too large, %d maximum", INT_MAX); - RETURN_FALSE; - } data_size = (int)data_len; data_s = emalloc(data_size + 1); memset(data_s, 0, data_size);

« previous php.cvs (#93904) next »