- Fix possible memory leak

felipensp · felipensp · commit 420068c6e180 · 2013-10-20T01:04:55.000-02:00
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -1856,15 +1856,16 @@ static ZIPARCHIVE_METHOD(addFromString)
 	/* TODO: fix  _zip_replace */
 	if (cur_idx >= 0) {
 		if (zip_delete(intern, cur_idx) == -1) {
-			RETURN_FALSE;
+			goto fail;
 		}
 	}
 
-	if (zip_add(intern, name, zs) == -1) {
-		RETURN_FALSE;
-	} else {
+	if (zip_add(intern, name, zs) != -1) {
 		RETURN_TRUE;
 	}
+fail:
+	zip_source_free(zs);
+	RETURN_FALSE;	
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1856,15 +1856,16 @@ static ZIPARCHIVE_METHOD(addFromString)`
`1856`	`1856`	`/* TODO: fix _zip_replace */`
`1857`	`1857`	`if (cur_idx >= 0) {`
`1858`	`1858`	`if (zip_delete(intern, cur_idx) == -1) {`
`1859`		`- RETURN_FALSE;`
	`1859`	`+ goto fail;`
`1860`	`1860`	`}`
`1861`	`1861`	`}`
`1862`	`1862`
`1863`		`- if (zip_add(intern, name, zs) == -1) {`
`1864`		`- RETURN_FALSE;`
`1865`		`- } else {`
	`1863`	`+ if (zip_add(intern, name, zs) != -1) {`
`1866`	`1864`	`RETURN_TRUE;`
`1867`	`1865`	`}`
	`1866`	`+fail:`
	`1867`	`+ zip_source_free(zs);`
	`1868`	`+ RETURN_FALSE;`
`1868`	`1869`	`}`
`1869`	`1870`	`/* }}} */`
`1870`	`1871`