From: krakjoe <joe.watkins@live.co.uk>
Date: Tue, 6 May 2014 10:22:15 +0000 (+0100)
Subject: ...
X-Git-Tag: POST_PHPNG_MERGE~406
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2fe1c16484a5abc07ec67a2ce50a0e754aa1fba;p=php

...
---

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index b9df203c24..9183ed9b9f 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,