commit ed37dfe735cb07c2e95a56eb6c84a8bae794bc49
author Janis Danisevskis <jdanis@google.com> Sun Mar 13 14:47:23 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Mar 13 14:47:23 2016 +0000
tree ad8aeb2bc576ec95cfd8e8c8f3190b07faa68266
parent 546fe4e07474a09194a3fdf484c3ef32903f3641
parent 76874f80187e59aa6d32673cf2c60500dfae1299

Merge "Leftovers of the SELinux policy update mechanism"

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 30a38e3..a856672 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))) {