summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2018-09-08 00:24:58 +0200
committerTianjie Xu <xunchang@google.com>2018-09-08 01:14:57 +0200
commitf39f139103f8d06a0ec24f0d45e263f5c56a0c94 (patch)
tree267c4e9b290a61345b75b253711ff362f193a2c1
parentDO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 (diff)
downloadandroid_bootable_recovery-f39f139103f8d06a0ec24f0d45e263f5c56a0c94.tar
android_bootable_recovery-f39f139103f8d06a0ec24f0d45e263f5c56a0c94.tar.gz
android_bootable_recovery-f39f139103f8d06a0ec24f0d45e263f5c56a0c94.tar.bz2
android_bootable_recovery-f39f139103f8d06a0ec24f0d45e263f5c56a0c94.tar.lz
android_bootable_recovery-f39f139103f8d06a0ec24f0d45e263f5c56a0c94.tar.xz
android_bootable_recovery-f39f139103f8d06a0ec24f0d45e263f5c56a0c94.tar.zst
android_bootable_recovery-f39f139103f8d06a0ec24f0d45e263f5c56a0c94.zip
Diffstat (limited to '')
-rw-r--r--install.cpp2
-rw-r--r--updater/updater.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/install.cpp b/install.cpp
index d30890a9e..05209cdca 100644
--- a/install.cpp
+++ b/install.cpp
@@ -481,7 +481,7 @@ really_install_package(const char *path, bool* wipe_cache, bool needs_mount,
}
// Try to open the package.
- ZipArchive zip;
+ ZipArchive zip = {};
int 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 e956dd557..96755735e 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -77,7 +77,7 @@ int main(int argc, char** argv) {
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) {