commit 74152ce6feadecf8a03ef2f82dac59f47f98fdd9
author Steven Moreland <smoreland@google.com> Fri Aug 02 14:29:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 02 14:29:55 2019 -0700
tree 19b30ecb7a3aa770e9b62ceb4ee2452c5b4d99db
parent 8161deac81d94f32c273fb8f5d48ae0a253492e7
parent 63a87474306d072ca434145eacda1bce92a35833

Merge "logcat: error on multiple PID argument"
am: 41a5c022b4

Change-Id: Idc6b3283854cef283ef37c0b8d8c4e8204a9e7f5

logcat/logcat.cpp

diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 6e38d95..6507711 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -899,6 +899,11 @@
             case 0:
                 // only long options
                 if (long_options[option_index].name == pid_str) {
+                    if (pid != 0) {
+                        logcat_panic(context, HELP_TRUE, "Only supports one PID argument.\n");
+                        goto exit;
+                    }
+
                     // ToDo: determine runtime PID_MAX?
                     if (!getSizeTArg(optarg, &pid, 1)) {
                         logcat_panic(context, HELP_TRUE, "%s %s out of range\n",