diff options
| author | Rasmus Lerdorf <rasmus@lerdorf.com> | 2013-10-20 22:18:15 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@lerdorf.com> | 2013-10-20 22:18:15 -0700 |
| commit | 910d4751e3c9e969a26a590780a4688a47a77850 (patch) | |
| tree | 8822facd499594bcc04c002d54e6505713e6264c /ext/zip | |
| parent | 9e4651f6f181e0d90daab2a97fb57a76fe105a29 (diff) | |
| parent | 2186e1583d9d65d0e79d05ec706f1e12b97bb035 (diff) | |
| download | php-git-910d4751e3c9e969a26a590780a4688a47a77850.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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.
Diffstat (limited to 'ext/zip')
| -rw-r--r-- | ext/zip/lib/zip_source_error.c | 2 |
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) { } |