commit b7bcd06856b2d851d5b3c2b1b0147e8c0f0ec829
author Pavlin Radoslavov <pavlin@google.com> Thu Jan 26 07:35:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 07:35:44 2017 +0000
tree ecd889e5ac570c4fd60f881dab845d61aaf259bc
parent 8197519152a3ea7ea3f2eae2666c653a6ef51c36
parent 1598c6c75f0cd53256d14d2233d04cfe9a208f10

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

Change-Id: I0efbcbb2542676e9310752d10c208704c46ca22d

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