From: Rasmus Lerdorf <rasmus@lerdorf.com>
Date: Sun, 20 Oct 2013 15:55:48 +0000 (-0700)
Subject: Minor Coverity tweaks
X-Git-Tag: php-5.5.6RC1~5^2~18^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1494298231072d5991e76db5ef25f20e81018106;p=php

Minor Coverity tweaks
---

diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 58d3c2ec4d..4da8d602c9 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -1643,7 +1643,7 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path TSRMLS_DC)
 	if (ftp->resp == 226) {
 		ftp->data = data_close(ftp, data);
 		php_stream_close(tmpstream);
-		return ecalloc(1, sizeof(char**));
+		return ecalloc(1, sizeof(char*));
 	}
 
 	/* pull data buffer into tmpfile */
@@ -1671,11 +1671,11 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path TSRMLS_DC)
 		}
 	}
 
-	ftp->data = data = data_close(ftp, data);
+	ftp->data = data_close(ftp, data);
 
 	php_stream_rewind(tmpstream);
 
-	ret = safe_emalloc((lines + 1), sizeof(char**), size * sizeof(char*));
+	ret = safe_emalloc((lines + 1), sizeof(char*), size * sizeof(char*));
 
 	entry = ret;
 	text = (char*) (ret + lines + 1);