| commit | 517f6d476e937cf53d46573cffaf0ab37a9ebb8d | [log] [tgz] |
|---|---|---|
| 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 | 294f7312dd6f837402cd5ac67c3beef8ad3bf7b4 [diff] | |
| parent | 6adbd4e787c3dab52c8bf7f0042c120bbfb15b8b [diff] |
Merge "Fix a crash when parsing fastboot command-line arguments"
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);