Skip to content

Fix cmdarg exception leak in various edge cases #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rakitzis merged 1 commit into from
Apr 24, 2026
Merged

Fix cmdarg exception leak in various edge cases #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions trip.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,3 +718,12 @@ submatch 'flag xx' 'usage: flag f [ + | - ]' 'flag wrong first arg'
submatch 'flag x x' 'usage: flag f [ + | - ]' 'flag wrong second arg'
submatch 'flag c && echo yes' yes 'flag c'
submatch 'flag x +; flag x -' 'flag x -' 'setting x flag'

# test for cmdarg exception leak in various nodes
$rc -c 'foo=<{true}' || fail 'cmdarg leak in nAssign'
$rc -c 'for(i in <{true}) echo $i >/dev/null' || fail 'cmdarg leak in nForin'
$rc -c 'foo=<{true} echo -n' || fail 'cmdarg leak in nPre'
$rc -c 'fn foo { cat <{true} }' || fail 'cmdarg leak in nNewfn'
$rc -c 'fn <{true} { }' || fail 'cmdarg leak in nRmfn'
$rc -c '~ <{true} /dev/fd/*' || fail 'cmdarg leak in nMatch'
$rc -c 'switch (<{true}) { case *; }' || fail 'cmdarg leak in nSwitch'
16 changes: 13 additions & 3 deletions walk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ top: sigchk();
break;
}
case nForin: {
List *l, *var = glom(n->u[0].p);
List *var = glom(n->u[0].p);
List *l = listcpy(glob(glom(n->u[1].p)), nalloc);
Jbwrap break_jb;
Edata break_data;
Estack break_stack;
Expand All @@ -147,7 +148,7 @@ top: sigchk();
break_data.jb = &break_jb;
except(eBreak, break_data, &break_stack);

for (l = listcpy(glob(glom(n->u[1].p)), nalloc); l != NULL; l = l->n) {
for (; l != NULL; l = l->n) {
Edata iter_data;
Estack iter_stack;
assign(var, word(l->w, NULL), FALSE);
Expand All @@ -157,6 +158,7 @@ top: sigchk();
unexcept(eArena);
}
unexcept(eBreak);
pop_cmdarg(TRUE);
break;
}
case nSubshell:
Expand All @@ -170,6 +172,7 @@ top: sigchk();
if (n->u[0].p == NULL)
rc_error("null variable name");
assign(glom(n->u[0].p), glob(glom(n->u[1].p)), FALSE);
pop_cmdarg(TRUE);
break;
case nPipe:
dopipe(n);
Expand All @@ -185,6 +188,7 @@ top: sigchk();
l = l->n;
}
set(TRUE);
pop_cmdarg(TRUE);
break;
}
case nRmfn: {
Expand All @@ -196,6 +200,7 @@ top: sigchk();
l = l->n;
}
set(TRUE);
pop_cmdarg(TRUE);
break;
}
case nDup:
Expand All @@ -206,22 +211,26 @@ top: sigchk();
if (dashex)
fprint(2, (a != NULL && a->n != NULL) ? "~ (%L) %L\n" : "~ %L %L\n", a, " ", b, " ");
set(lmatch(a, b));
pop_cmdarg(TRUE);
break;
}
case nSwitch: {
List *v = glom(n->u[0].p);
while (1) {
do {
n = n->u[1].p;
if (n == NULL)
if (n == NULL) {
pop_cmdarg(TRUE);
return istrue();
}
} while (n->u[0].p == NULL || n->u[0].p->type != nCase);
if (lmatch(v, glom(n->u[0].p->u[0].p))) {
for (n = n->u[1].p; n != NULL && (n->u[0].p == NULL || n->u[0].p->type != nCase); n = n->u[1].p)
walk(n->u[0].p, TRUE);
break;
}
}
pop_cmdarg(TRUE);
break;
}
case nPre: {
Expand Down Expand Up @@ -250,6 +259,7 @@ top: sigchk();
walk(n->u[1].p, parent);
varrm(v->w, TRUE);
unexcept(eVarstack);
pop_cmdarg(TRUE);
}
} else
panic("unexpected node in preredir section of walk");
Expand Down
Loading