summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-10-20 23:04:03 -0700
committerStanislav Malyshev <stas@php.net>2013-10-20 23:04:03 -0700
commit8f19a8da65f22bc7cf143c0d1f2cf2bcabce1d29 (patch)
treec58e81291897e3eaa1a5595f643a707788513074
parent8bef8e66cfaa575b63b5032b2cce32c5f73b3c94 (diff)
parent910d4751e3c9e969a26a590780a4688a47a77850 (diff)
downloadphp-git-8f19a8da65f22bc7cf143c0d1f2cf2bcabce1d29.tar.gz
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: When src->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->src is never null, but just in case this initialization doesn't hurt.
-rw-r--r--ext/zip/lib/zip_source_error.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/lib/zip_source_error.c b/ext/zip/lib/zip_source_error.c
index ffb4652d33..70ec8bc5d4 100644
--- 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) {
}