Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-26 03:35:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't sanity_lose if INTERNAL_BLOCK_NODEs have a null argv

Browse source 
Fixes #1545
This commit is contained in:
ridiculousfish 2014-07-12 11:01:00 -07:00
parent 98297e5234
commit 495adee269
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
proc.cpp
View file

@ -1298,9 +1298,11 @@ void proc_sanity_check()
p = j->first_process; p = j->first_process;
while (p) while (p)
{ {
validate_pointer(p->get_argv(), _(L"Process argument list"), 0); /* Internal block nodes do not have argv - see #1545 */
validate_pointer(p->argv0(), _(L"Process name"), 0); bool null_ok = (p->type == INTERNAL_BLOCK_NODE);
validate_pointer(p->next, _(L"Process list pointer"), 1); validate_pointer(p->get_argv(), _(L"Process argument list"), null_ok);
validate_pointer(p->argv0(), _(L"Process name"), null_ok);
validate_pointer(p->next, _(L"Process list pointer"), true);
if ((p->stopped & (~0x00000001)) != 0) if ((p->stopped & (~0x00000001)) != 0)
{ {