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

Commit dcd2f0ef authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Elliott Hughes
Browse files

Uniformly escape shell arguments. 

Arguments with embedded spaces need to be wrapped in quotes, which
changes the overall escaping strategy.  Instead of mixing the two
strategies, just always wrap arguments in quotes.

(cherry-pick of fd546e8c.)

Bug: 15479704
Change-Id: I03eacfa1bd6c220d4ec6617b825ebb0c43c7221e
parent 6d9a5ac3

adb/commandline.c

+25 −40
Original line number Diff line number Diff line
@@ -544,39 +544,33 @@ static void status_window(transport_type ttype, const char* serial) 
    }

}



/** duplicate string and quote all \ " ( ) chars + space character. */

static char *

dupAndQuote(const char *s)

/** Duplicate and escape given argument. */

static char *escape_argv(const char *s)

{

    const char *ts;

    size_t alloc_len;

    char *ret;

    char *dest;



    ts = s;



    alloc_len = 0;



    for( ;*ts != '\0'; ts++) {

    alloc_len = 2;

    for (ts = s; *ts != '\0'; ts++) {

        alloc_len++;

        if (*ts == ' ' || *ts == '"' || *ts == '\\' || *ts == '(' || *ts == ')') {

        if (*ts == '"' || *ts == '\\') {

            alloc_len++;

        }

    }



    ret = (char *) malloc(alloc_len + 1);



    ts = s;

    dest = ret;



    for ( ;*ts != '\0'; ts++) {

        if (*ts == ' ' || *ts == '"' || *ts == '\\' || *ts == '(' || *ts == ')') {

    *dest++ = '"';

    for (ts = s; *ts != '\0'; ts++) {

        if (*ts == '"' || *ts == '\\') {

            *dest++ = '\\';

        }



        *dest++ = *ts;

    }



    *dest++ = '"';

    *dest++ = '\0';



    return ret;
@@ -683,16 +677,13 @@ static int logcat(transport_type transport, char* serial, int argc, char **argv) 
    char buf[4096];



    char *log_tags;

    char *quoted_log_tags;

    char *quoted;



    log_tags = getenv("ANDROID_LOG_TAGS");

    quoted_log_tags = dupAndQuote(log_tags == NULL ? "" : log_tags);



    quoted = escape_argv(log_tags == NULL ? "" : log_tags);

    snprintf(buf, sizeof(buf),

        "shell:export ANDROID_LOG_TAGS=\"\%s\" ; exec logcat",

        quoted_log_tags);



    free(quoted_log_tags);

            "shell:export ANDROID_LOG_TAGS=%s ; exec logcat", quoted);

    free(quoted);



    if (!strcmp(argv[0], "longcat")) {

        strncat(buf, " -v long", sizeof(buf) - 1);
@@ -701,10 +692,7 @@ static int logcat(transport_type transport, char* serial, int argc, char **argv) 
    argc -= 1;

    argv += 1;

    while(argc-- > 0) {

        char *quoted;



        quoted = dupAndQuote (*argv++);



        quoted = escape_argv(*argv++);

        strncat(buf, " ", sizeof(buf) - 1);

        strncat(buf, quoted, sizeof(buf) - 1);

        free(quoted);
@@ -1218,7 +1206,7 @@ top: 
        argc -= 2;

        argv += 2;

        while (argc-- > 0) {

            char *quoted = dupAndQuote(*argv++);

            char *quoted = escape_argv(*argv++);

            strncat(buf, " ", sizeof(buf) - 1);

            strncat(buf, quoted, sizeof(buf) - 1);

            free(quoted);
@@ -1261,7 +1249,7 @@ top: 
        argc -= 2;

        argv += 2;

        while (argc-- > 0) {

            char *quoted = dupAndQuote(*argv++);

            char *quoted = escape_argv(*argv++);

            strncat(buf, " ", sizeof(buf) - 1);

            strncat(buf, quoted, sizeof(buf) - 1);

            free(quoted);
@@ -1686,10 +1674,7 @@ static int pm_command(transport_type transport, char* serial, 
    snprintf(buf, sizeof(buf), "shell:pm");



    while(argc-- > 0) {

        char *quoted;



        quoted = dupAndQuote(*argv++);



        char *quoted = escape_argv(*argv++);

        strncat(buf, " ", sizeof(buf) - 1);

        strncat(buf, quoted, sizeof(buf) - 1);

        free(quoted);
@@ -1723,7 +1708,7 @@ static int delete_file(transport_type transport, char* serial, char* filename) 
    char* quoted;



    snprintf(buf, sizeof(buf), "shell:rm ");

    quoted = dupAndQuote(filename);

    quoted = escape_argv(filename);

    strncat(buf, quoted, sizeof(buf)-1);

    free(quoted);