Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5e7f73b authored by Jorge Lucangeli Obes's avatar Jorge Lucangeli Obes
Browse files

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
parent ad2021a1

toolbox/ps.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -282,6 +282,13 @@ int ps_main(int argc, char **argv) 
        } else if(!strcmp(argv[1],"--abi")) {

        } else if(!strcmp(argv[1],"--abi")) {

            display_flags |= SHOW_ABI;

            display_flags |= SHOW_ABI;

        } else if(!strcmp(argv[1],"--ppid")) {

        } 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]);

            ppid_filter = atoi(argv[2]);

            if (ppid_filter == 0) {

            if (ppid_filter == 0) {

                /* Bug 26554285: Use printf because some apps require at least

                /* Bug 26554285: Use printf because some apps require at least