com php-src: ...: ext/mcrypt/mcrypt.c

From: Date: Tue, 06 May 2014 10:22:15 +0000
Subject: com php-src: ...: ext/mcrypt/mcrypt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78123@lists.php.net to get a copy of this message 
Commit:    b2fe1c16484a5abc07ec67a2ce50a0e754aa1fba
Author:    krakjoe <joe.watkins@live.co.uk>         Tue, 6 May 2014 11:22:15 +0100
Parents:   ff9597a23819209922ef65591007a3c1475a6ccb
Branches:  phpng

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=b2fe1c16484a5abc07ec67a2ce50a0e754aa1fba

Log:
..

Changed paths:
  M  ext/mcrypt/mcrypt.c


Diff:
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index b9df203..9183ed9 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -1303,7 +1303,7 @@ static void php_mcrypt_do_crypt(char* cipher, const char *key, int key_len,
cons
    OFB crypt/decrypt data using key key with cipher cipher starting with iv */
 PHP_FUNCTION(mcrypt_encrypt)
 {
-	char *cipher, *key = NULL, *data, *mode, *iv = NULL;
+	char *cipher, *key, *data, *mode, *iv = NULL;
 	int cipher_len, key_len, data_len, mode_len, iv_len = 0;
 	
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssss|s", &cipher,
&cipher_len,

Thread (1 message)

  • Joe Watkins
« previous php.cvs (#78123) next »