ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Uniformly escape shell arguments.

Browse source 
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 fd546e8c35341b518873eb4f883afbed92e947af.)

Bug: 15479704
Change-Id: I03eacfa1bd6c220d4ec6617b825ebb0c43c7221e
This commit is contained in:
Jeff Sharkey 2014-06-10 11:31:24 -07:00 • committed by Elliott Hughes
parent 6d9a5ac394
commit dcd2f0ef2f
1 changed files with 25 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
adb/commandline.c
View file

@ -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;
ret = (char *) malloc(alloc_len + 1);
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,30 +677,24 @@ 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);
"shell:export ANDROID_LOG_TAGS=%s ; exec logcat", quoted);
free(quoted);
free(quoted_log_tags);
if (!strcmp(argv[0],"longcat")) {
strncat(buf, " -v long", sizeof(buf)-1);
if (!strcmp(argv[0], "longcat")) {
strncat(buf, " -v long", sizeof(buf) - 1);
}
argc -= 1;
argv += 1;
while(argc-- > 0) {
char *quoted;
quoted = dupAndQuote (*argv++);
strncat(buf, " ", sizeof(buf)-1);
strncat(buf, quoted, sizeof(buf)-1);
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,12 +1674,9 @@ static int pm_command(transport_type transport, char* serial,
snprintf(buf, sizeof(buf), "shell:pm");
while(argc-- > 0) {
char *quoted;
quoted = dupAndQuote(*argv++);
strncat(buf, " ", sizeof(buf)-1);
strncat(buf, quoted, sizeof(buf)-1);
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);