commit 37c0f78ded48eede9369a4baf4f485e44a3cd56d
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 26 07:23:17 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 26 07:23:18 2017 +0000
tree ea5b6c6c821f33878445383f595dad698f0d992c
parent 295df9208c90e94f5cfe04afd7e90400aec34923
parent 590f642ed3f9dd8bda9560bce52251137a36a5d0

Merge "Fix a crash when parsing fastboot command-line arguments"

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index f970e68..e7f1a07 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1648,8 +1648,7 @@
                     wants_reboot = false;
                     wants_reboot_bootloader = true;
                     skip(1);
-                }
-                if (!strcmp(*argv, "emergency")) {
+                } else if (!strcmp(*argv, "emergency")) {
                     wants_reboot = false;
                     wants_reboot_emergency = true;
                     skip(1);