commit 93015f75ba26bbdf43e06481b8d93e701dba0d17
author android-build-team Robot <android-build-team-robot@google.com> Thu Mar 01 08:24:32 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 01 08:24:32 2018 +0000
tree c7619169afcf21edf6430e53dab1e54045c4dd41
parent 4bda178fe4d67f7522662ed6708e08f62e03c77d
parent bb928df6ebd70ac0680184927ea00b373c3e507f

Snap for 4628106 from bb928df6ebd70ac0680184927ea00b373c3e507f to pi-release

Change-Id: I7c640dea7542f462d8bd820cc0f19d53c367035a

updater/blockimg.cpp

diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index feb2aeb..4f085b2 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1727,9 +1727,11 @@
 
     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.