Merge branch 'PHP-5.4' into PHP-5.5

rlerdorf · rlerdorf · commit c5e5a6c2ac68 · 2013-10-20T08:56:24.000-07:00
* PHP-5.4:
  Minor Coverity tweaks
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
@@ -1638,7 +1638,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 */
@@ -1666,11 +1666,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
`@@ -1638,7 +1638,7 @@ ftp_genlist(ftpbuf_t ftp, const char cmd, const char *path TSRMLS_DC)`
`1638`	`1638`	`if (ftp->resp == 226) {`
`1639`	`1639`	`ftp->data = data_close(ftp, data);`
`1640`	`1640`	`php_stream_close(tmpstream);`
`1641`		`- return ecalloc(1, sizeof(char**));`
	`1641`	`+ return ecalloc(1, sizeof(char*));`
`1642`	`1642`	`}`
`1643`	`1643`
`1644`	`1644`	`/* pull data buffer into tmpfile */`
`@@ -1666,11 +1666,11 @@ ftp_genlist(ftpbuf_t ftp, const char cmd, const char *path TSRMLS_DC)`
`1666`	`1666`	`}`
`1667`	`1667`	`}`
`1668`	`1668`
`1669`		`- ftp->data = data = data_close(ftp, data);`
	`1669`	`+ ftp->data = data_close(ftp, data);`
`1670`	`1670`
`1671`	`1671`	`php_stream_rewind(tmpstream);`
`1672`	`1672`
`1673`		`- ret = safe_emalloc((lines + 1), sizeof(char*), size sizeof(char*));`
	`1673`	`+ ret = safe_emalloc((lines + 1), sizeof(char), size sizeof(char*));`
`1674`	`1674`
`1675`	`1675`	`entry = ret;`
`1676`	`1676`	`text = (char*) (ret + lines + 1);`