Merge cherrypicks of [6738238, 6739193, 6738335, 6738239, 6739470, 6739471, 6738201, 6738202, 6738203, 6738204, 6738205, 6738206, 6738207, 6738208, 6738209, 6739510, 6739511, 6739512, 6739513, 6739514, 6739515, 6739516, 6738336, 6739517, 6739518, 6738416, 6738417, 6739472, 6739473, 6739519, 6739520, 6739071, 6739072, 6738695, 6738696, 6738697, 6738698, 6738699, 6738243, 6739521, 6738244, 6738153, 6738154, 6738155, 6738156, 6738157, 6738158, 6738159, 6738160, 6739522, 6739523] into nyc-bugfix-release
Change-Id: I2b8b046191f3cb0ea24494df0caeb36348f1000f
diff --git a/install.cpp b/install.cpp
index 5a439a1..c76da20 100644
--- a/install.cpp
+++ b/install.cpp
@@ -323,7 +323,7 @@
}
// Try to open the package.
- ZipArchive zip;
+ ZipArchive zip = {};
err = mzOpenZipArchive(map.addr, map.length, &zip);
if (err != 0) {
LOGE("Can't open %s\n(%s)\n", path, err != -1 ? strerror(err) : "bad");
diff --git a/updater/updater.cpp b/updater/updater.cpp
index e956dd5..9675573 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -77,7 +77,7 @@
printf("failed to map package %s\n", argv[3]);
return 3;
}
- ZipArchive za;
+ ZipArchive za = {};
int err;
err = mzOpenZipArchive(map.addr, map.length, &za);
if (err != 0) {
