commit ffbd354e6c8c1eda941dc2941bb8b0766d5aea0e
author Pavlin Radoslavov <pavlin@google.com> Thu Jan 26 07:29:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 07:29:30 2017 +0000
tree ea5b6c6c821f33878445383f595dad698f0d992c
parent c5224d4412a2f3e9953f9342b7620ec4e24100b8
parent 37c0f78ded48eede9369a4baf4f485e44a3cd56d

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

Change-Id: I739fb29f259503f0fe39d7b0122cbbb134cfcee1

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