commit 1598c6c75f0cd53256d14d2233d04cfe9a208f10
author Pavlin Radoslavov <pavlin@google.com> Thu Jan 26 07:32:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 07:32:01 2017 +0000
tree 33ffafd9b117bab6efc42f557f6c5d0f4eb20370
parent 3229bdc548aa5f1298865c4051c803a91e0b0c3a
parent ffbd354e6c8c1eda941dc2941bb8b0766d5aea0e

Merge "Fix a crash when parsing fastboot command-line arguments" am: 517f6d476e
am: 1c1ee87e35

Change-Id: I5020f555a4181b78ee7ff744f05cf09268f33b8d

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);