diff options
| author | Derick Rethans <derick@php.net> | 2001-05-18 20:54:15 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2001-05-18 20:54:15 +0000 |
| commit | d1697ad012854bea81dfbe7792dce96b6bb0701a (patch) | |
| tree | 578e8a653fbcda15ca9933f07d716ae91d776d30 /ext/mcrypt/mcrypt.c | |
| parent | e29a1b223068cb6096e0f59eeb6218266a9fd558 (diff) | |
| download | php-git-d1697ad012854bea81dfbe7792dce96b6bb0701a.tar.gz | |
- Fix for bug #10890
@- Fixed bugs in the mcrypt extension that caused crashes (Derick)
Diffstat (limited to 'ext/mcrypt/mcrypt.c')
| -rw-r--r-- | ext/mcrypt/mcrypt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index b897472c1e..58875aba42 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -439,7 +439,7 @@ PHP_FUNCTION(mcrypt_generic_init) zval **mcryptind; unsigned char *key_s, *iv_s; char dummy[256]; - int max_key_size, iv_size; + int max_key_size, key_size, iv_size; MCRYPT td; int argc; MCLS_FETCH(); @@ -464,7 +464,10 @@ PHP_FUNCTION(mcrypt_generic_init) if (Z_STRLEN_PP(key) > max_key_size) { sprintf (dummy, "key size too large; supplied length: %d, max: %d", Z_STRLEN_PP(key), max_key_size); - php_error (E_NOTICE, dummy); + php_error (E_WARNING, dummy); + key_size = max_key_size; + } else { + key_size = Z_STRLEN_PP(key); } memcpy (key_s, Z_STRVAL_PP(key), Z_STRLEN_PP(key)); @@ -475,7 +478,7 @@ PHP_FUNCTION(mcrypt_generic_init) } memcpy (iv_s, Z_STRVAL_PP(iv), iv_size); - RETVAL_LONG (mcrypt_generic_init (td, key_s, Z_STRLEN_PP(key), iv_s)); + RETVAL_LONG (mcrypt_generic_init (td, key_s, key_size, iv_s)); efree (iv_s); efree (key_s); } |