summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2018-02-28 19:49:56 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-02-28 19:49:56 +0100
commitac4818d6afe80cb71d19d34cd6c36fd9a04e7b6d (patch)
treef24ac44003f8381db9bb5d25f8daac0850266eb5
parentMerge "Remove the assumption of target chunk size in imgdiff" (diff)
parentFix the behavior of undefined commands in BlockImageVerify (diff)
downloadandroid_bootable_recovery-ac4818d6afe80cb71d19d34cd6c36fd9a04e7b6d.tar
android_bootable_recovery-ac4818d6afe80cb71d19d34cd6c36fd9a04e7b6d.tar.gz
android_bootable_recovery-ac4818d6afe80cb71d19d34cd6c36fd9a04e7b6d.tar.bz2
android_bootable_recovery-ac4818d6afe80cb71d19d34cd6c36fd9a04e7b6d.tar.lz
android_bootable_recovery-ac4818d6afe80cb71d19d34cd6c36fd9a04e7b6d.tar.xz
android_bootable_recovery-ac4818d6afe80cb71d19d34cd6c36fd9a04e7b6d.tar.zst
android_bootable_recovery-ac4818d6afe80cb71d19d34cd6c36fd9a04e7b6d.zip
Diffstat (limited to '')
-rw-r--r--updater/blockimg.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index feb2aeb27..4f085b204 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1727,9 +1727,11 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
const Command* cmd = cmd_map[params.cmdname];
+ // Skip the command if we explicitly set the corresponding function pointer to nullptr, e.g.
+ // "erase" during block_image_verify.
if (cmd->f == nullptr) {
- LOG(ERROR) << "failed to find the function for command [" << line << "]";
- goto pbiudone;
+ LOG(DEBUG) << "skip executing command [" << line << "]";
+ continue;
}
// Skip all commands before the saved last command index when resuming an update.