diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-12-08 12:25:52 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-12-08 12:25:52 +0300 |
| commit | 70a2748b5ea2cdb26f67fbe1d2b365d42b57af07 (patch) | |
| tree | a7298faaa0b73b253962b004427d455bb140e462 /ext/mcrypt/mcrypt.c | |
| parent | c6d0c55a23918c8a5e8e2f583fc9ce58ddcd4e54 (diff) | |
| parent | 278c38165c9bb841f028d60f53170cc61a17a898 (diff) | |
| download | php-git-70a2748b5ea2cdb26f67fbe1d2b365d42b57af07.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed possible read after end of buffer and use after free.
Diffstat (limited to 'ext/mcrypt/mcrypt.c')
| -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 4341bbe5c1..d33cdd5972 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -579,8 +579,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); @@ -601,8 +604,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); |