Fix buffer overrun in adb wait-for-device.
Bug: http://b/27444063
(cherry picked from commit 34e560b9a1e44dcfa0c220c9499bbb833a95a2b4)
Change-Id: Ic71cb2070f509d76fb4208dbab6711c5dd5e1f62
diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index e522119..5aa878b 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1029,8 +1029,8 @@
// TODO: when we have libc++ for Windows, use a regular expression instead.
// wait-for-((any|local|usb)-)?(bootloader|device|recovery|sideload)
- char type[20];
- char state[20];
+ char type[20 + 1]; // sscanf's %20[...] doesn't include the NUL.
+ char state[20 + 1];
int length = 0;
if (sscanf(service, "wait-for-%20[a-z]-%20[a-z]%n", type, state, &length) < 2 ||
length != static_cast<int>(strlen(service))) {