Minor Coverity tweaks

rlerdorf · rlerdorf · commit 149429823107 · 2013-10-20T08:55:48.000-07:00
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1643,7 +1643,7 @@ ftp_genlist(ftpbuf_t ftp, const char cmd, const char *path TSRMLS_DC)`
`1643`	`1643`	`if (ftp->resp == 226) {`
`1644`	`1644`	`ftp->data = data_close(ftp, data);`
`1645`	`1645`	`php_stream_close(tmpstream);`
`1646`		`- return ecalloc(1, sizeof(char**));`
	`1646`	`+ return ecalloc(1, sizeof(char*));`
`1647`	`1647`	`}`
`1648`	`1648`
`1649`	`1649`	`/* pull data buffer into tmpfile */`
`@@ -1671,11 +1671,11 @@ ftp_genlist(ftpbuf_t ftp, const char cmd, const char *path TSRMLS_DC)`
`1671`	`1671`	`}`
`1672`	`1672`	`}`
`1673`	`1673`
`1674`		`- ftp->data = data = data_close(ftp, data);`
	`1674`	`+ ftp->data = data_close(ftp, data);`
`1675`	`1675`
`1676`	`1676`	`php_stream_rewind(tmpstream);`
`1677`	`1677`
`1678`		`- ret = safe_emalloc((lines + 1), sizeof(char*), size sizeof(char*));`
	`1678`	`+ ret = safe_emalloc((lines + 1), sizeof(char), size sizeof(char*));`
`1679`	`1679`
`1680`	`1680`	`entry = ret;`
`1681`	`1681`	`text = (char*) (ret + lines + 1);`