Merge branch 'PHP-5.4' into PHP-5.5

rlerdorf · rlerdorf · commit 910d4751e3c9 · 2013-10-20T22:18:15.000-07:00
* PHP-5.4:
  When src-&gt;src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src-&gt;src is never null, but just in case this initialization doesn't hurt.
diff --git a/ext/zip/lib/zip_source_error.c b/ext/zip/lib/zip_source_error.c
@@ -40,7 +40,7 @@
 ZIP_EXTERN(void)
 zip_source_error(struct zip_source *src, int *ze, int *se)
 {
-    int e[2];
+    int e[2] = { 0, 0 };
 
     if (src->src == NULL) {
     }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`ZIP_EXTERN(void)`
`41`	`41`	`zip_source_error(struct zip_source src, int ze, int *se)`
`42`	`42`	`{`
`43`		`- int e[2];`
	`43`	`+ int e[2] = { 0, 0 };`
`44`	`44`
`45`	`45`	`if (src->src == NULL) {`
`46`	`46`	`}`