commit 4455ee0ff21a1c4b05e0ab2f710fbfab6af3180a
author Pavlin Radoslavov <pavlin@google.com> Thu Jan 26 07:40:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 07:40:40 2017 +0000
tree 1a8aa0ecb93d4532012cdb8a59be56524c8a628c
parent d71c63a5979dd570c338d2cdf9c97ffea102420f
parent b7bcd06856b2d851d5b3c2b1b0147e8c0f0ec829

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

Change-Id: I6cd126125c31b2fd5ef61512b104db75a91c422d

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