diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-12-08 12:18:27 +0300 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-12-10 13:33:13 +0100 |
| commit | ea2fc5a12332abf18e1d971be25715842dbe2e8d (patch) | |
| tree | fa7fa728a0602e6e5a36cf16dd7d86747b53c6d6 | |
| parent | 3020b613efe92f1f92e8e005551d0f9aacfc21ad (diff) | |
| download | php-git-ea2fc5a12332abf18e1d971be25715842dbe2e8d.tar.gz | |
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); |