diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-12-08 12:24:16 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-12-08 12:24:16 +0300 |
| commit | 278c38165c9bb841f028d60f53170cc61a17a898 (patch) | |
| tree | 2bcad5c7d69bbb8da54df9b6097e21da60cdb504 | |
| parent | 41a2f7074dabe6e702d4ce300c86894bfae1d4b1 (diff) | |
| parent | e6ad29ae96caec9353e42d528895bf2bec02a125 (diff) | |
| download | php-git-278c38165c9bb841f028d60f53170cc61a17a898.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed possible read after end of buffer and use after free.
| -rw-r--r-- | ext/mcrypt/mcrypt.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 5fc632b050..f336ba8b78 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -578,8 +578,11 @@ PHP_FUNCTION(mcrypt_generic_init) if (iv_len != iv_size) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Iv size incorrect; supplied length: %d, needed: %d", iv_len, iv_size); + if (iv_len > iv_size) { + iv_len = iv_size; + } } - memcpy(iv_s, iv, iv_size); + memcpy(iv_s, iv, iv_len); mcrypt_generic_deinit(pm->td); result = mcrypt_generic_init(pm->td, key_s, key_size, iv_s); @@ -600,8 +603,9 @@ PHP_FUNCTION(mcrypt_generic_init) php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error"); break; } + } else { + pm->init = 1; } - pm->init = 1; RETVAL_LONG(result); efree(iv_s); |