diff options
| author | Anatol Belski <ab@php.net> | 2014-08-27 21:53:06 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-27 21:53:06 +0200 |
| commit | 1e3e9e0bbbe073db4a32627e67e8f5d838852eaf (patch) | |
| tree | 7a145ee953caf16c59bb18f059b9f9c50c1d02bd /ext/mcrypt/mcrypt.c | |
| parent | bf96ee95cea4793b21abd5462a69fa3945f09fe7 (diff) | |
| download | php-git-1e3e9e0bbbe073db4a32627e67e8f5d838852eaf.tar.gz | |
's' and size_t - fix some invalid pointers and the remaining ext/mcrypt parts
Diffstat (limited to 'ext/mcrypt/mcrypt.c')
| -rw-r--r-- | ext/mcrypt/mcrypt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 1f02131aa5..bfd9003e55 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -1242,7 +1242,7 @@ static void php_mcrypt_do_crypt(char* cipher, const char *key, int key_len, cons { char *cipher_dir_string; char *module_dir_string; - unsigned long int data_size; + zend_long data_size; char *data_s; MCRYPT td; @@ -1337,7 +1337,7 @@ PHP_FUNCTION(mcrypt_ecb) { zval *mode; char *cipher, *key, *data, *iv = NULL; - int cipher_len, key_len, data_len, iv_len = 0; + size_t cipher_len, key_len, data_len, iv_len = 0; MCRYPT_GET_CRYPT_ARGS @@ -1353,7 +1353,7 @@ PHP_FUNCTION(mcrypt_cbc) { zval *mode; char *cipher, *key, *data, *iv = NULL; - int cipher_len, key_len, data_len, iv_len = 0; + size_t cipher_len, key_len, data_len, iv_len = 0; MCRYPT_GET_CRYPT_ARGS @@ -1369,7 +1369,7 @@ PHP_FUNCTION(mcrypt_cfb) { zval *mode; char *cipher, *key, *data, *iv = NULL; - int cipher_len, key_len, data_len, iv_len = 0; + size_t cipher_len, key_len, data_len, iv_len = 0; MCRYPT_GET_CRYPT_ARGS @@ -1385,7 +1385,7 @@ PHP_FUNCTION(mcrypt_ofb) { zval *mode; char *cipher, *key, *data, *iv = NULL; - int cipher_len, key_len, data_len, iv_len = 0; + size_t cipher_len, key_len, data_len, iv_len = 0; MCRYPT_GET_CRYPT_ARGS |