summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2001-09-23 14:39:08 +0000
committerDerick Rethans <derick@php.net>2001-09-23 14:39:08 +0000
commitdb1fe4b060cf98d2e20217bcd966ed416486669d (patch)
tree05d05da92778b4aefcac30bff82aba931e15deab /ext
parent9c610ae87fa0efa9761ea1520607144beebc73a8 (diff)
downloadphp-git-db1fe4b060cf98d2e20217bcd966ed416486669d.tar.gz
- Don't return from the function, so that mcrypt get properly initialized
(fix for bug #13399)
Diffstat (limited to 'ext')
-rw-r--r--ext/mcrypt/mcrypt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index d5fa590c44..4dbc3e961a 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -474,7 +474,6 @@ PHP_FUNCTION(mcrypt_generic_init)
if (Z_STRLEN_PP(key) == 0) {
php_error (E_WARNING, "key size is 0");
- RETURN_FALSE;
}
key_s = emalloc (Z_STRLEN_PP(key));
@@ -521,7 +520,7 @@ PHP_FUNCTION(mcrypt_generic)
MCRYPT_CHECK_PARAM_COUNT (2,2)
zend_get_parameters_ex(2, &mcryptind, &data);
- ZEND_FETCH_RESOURCE (td, MCRYPT, mcryptind, -1, "MCrypt", le_mcrypt);
+ ZEND_FETCH_RESOURCE (td, MCRYPT, mcryptind, -1, "MCrypt", le_mcrypt);
convert_to_string_ex (data);
/* Check blocksize */