aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaju Mathew <shaju@google.com>2023-03-22 01:35:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-22 01:35:40 +0000
commit0a7a269ddd99865447ea0967beabb09b22e0728e (patch)
tree66ac9b9bccc92e1673e25977f463fd9bf96d9341
parentfd1beaeb578faab05d69fe1eaf03578438d328b9 (diff)
parentb096bbad1039b063820587cff2f0c665b6eb9735 (diff)
downloadadb-0a7a269ddd99865447ea0967beabb09b22e0728e.tar.gz
Merge "adb: fix crash on `adb -t`." am: b2c9efa592 am: cb1b3b534d am: eb0be5c41e am: b096bbad10
Original change: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/1861899 Change-Id: Iadbf33ef271d03e932cbdf803418c28aae5c9409 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--client/commandline.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/client/commandline.cpp b/client/commandline.cpp
index 5d16d649..2823cbaf 100644
--- a/client/commandline.cpp
+++ b/client/commandline.cpp
@@ -1558,6 +1558,7 @@ int adb_commandline(int argc, const char** argv) {
if (isdigit(argv[0][2])) {
id = argv[0] + 2;
} else {
+ if (argc < 2 || argv[0][2] != '\0') error_exit("-t requires an argument");
id = argv[1];
--argc;
++argv;