cvs: php4 /ext/mcrypt mcrypt.c
| From: | Derick Rethans | Date: | Sun, 23 Sep 2001 14:39:08 +0000 |
| Subject: | cvs: php4 /ext/mcrypt mcrypt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7516@lists.php.net to get a copy of this message | ||
derick Sun Sep 23 10:39:08 2001 EDT
Modified files:
/php4/ext/mcrypt mcrypt.c
Log:
- Don't return from the function, so that mcrypt get properly initialized
(fix for bug #13399)
Index: php4/ext/mcrypt/mcrypt.c
diff -u php4/ext/mcrypt/mcrypt.c:1.63 php4/ext/mcrypt/mcrypt.c:1.64
--- php4/ext/mcrypt/mcrypt.c:1.63 Sun Sep 23 10:14:27 2001
+++ php4/ext/mcrypt/mcrypt.c Sun Sep 23 10:39:08 2001
@@ -474,7 +474,6 @@
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 @@
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 */