commit c5e7f73bc6708a8b6247c0b4a00e2b72b743c280
author Jorge Lucangeli Obes <jorgelo@google.com> Mon Apr 25 15:53:09 2016 -0700
committer Jorge Lucangeli Obes <jorgelo@google.com> Mon Apr 25 15:54:12 2016 -0700
tree 33627ad2a738fdc72830fa44c22e32a9184b5f46
parent ad2021a1b1144f8b307c11ff0a8b47fd85c3cc7a

Fix 'ps --ppid'.

Currently, 'ps' will segfault when called with '--ppid' and no argument.
Make it return an error instead.

Bug: 28383024

Change-Id: I71f2d1ba9502996ae75b17605234eb99ebb589f2

toolbox/ps.c

diff --git a/toolbox/ps.c b/toolbox/ps.c
index d366f3e..633c48e 100644
--- a/toolbox/ps.c
+++ b/toolbox/ps.c
@@ -282,6 +282,13 @@
         } else if(!strcmp(argv[1],"--abi")) {
             display_flags |= SHOW_ABI;
         } else if(!strcmp(argv[1],"--ppid")) {
+            if (argc < 3) {
+                /* Bug 26554285: Use printf because some apps require at least
+                 * one line of output to stdout even for errors.
+                 */
+                printf("no ppid\n");
+                return 1;
+            }
             ppid_filter = atoi(argv[2]);
             if (ppid_filter == 0) {
                 /* Bug 26554285: Use printf because some apps require at least