summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2018-02-28 20:05:04 +0100
committerandroid-build-merger <android-build-merger@google.com>2018-02-28 20:05:04 +0100
commite0f7c39c4fa68e6e3b0fcbf4ba725a3a6a782f55 (patch)
tree3831bf6718a06719c3611f7b66f95d8eeb00ad92
parentMerge "Remove the assumption of target chunk size in imgdiff" am: cc3446a7f7 (diff)
parentMerge "Fix the behavior of undefined commands in BlockImageVerify" (diff)
downloadandroid_bootable_recovery-e0f7c39c4fa68e6e3b0fcbf4ba725a3a6a782f55.tar
android_bootable_recovery-e0f7c39c4fa68e6e3b0fcbf4ba725a3a6a782f55.tar.gz
android_bootable_recovery-e0f7c39c4fa68e6e3b0fcbf4ba725a3a6a782f55.tar.bz2
android_bootable_recovery-e0f7c39c4fa68e6e3b0fcbf4ba725a3a6a782f55.tar.lz
android_bootable_recovery-e0f7c39c4fa68e6e3b0fcbf4ba725a3a6a782f55.tar.xz
android_bootable_recovery-e0f7c39c4fa68e6e3b0fcbf4ba725a3a6a782f55.tar.zst
android_bootable_recovery-e0f7c39c4fa68e6e3b0fcbf4ba725a3a6a782f55.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.