Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 05:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix null pointer deref in job_reap()

Browse source 
Coverity believes in this one in job_reap().
Proactively apply same check to format_job_info().
This commit is contained in:
Aaron Gyes 2016-10-17 14:37:20 -07:00
parent d474368ea5
commit 8a7b30d3f0
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/proc.cpp
View file

@ -503,7 +503,10 @@ static void format_job_info(const job_t *j, const wchar_t *status, size_t job_co
truncate_command(j->command()).c_str(), status); truncate_command(j->command()).c_str(), status);
} }
fflush(stdout); fflush(stdout);
if (cur_term != NULL)
tputs(clr_eol, 1, &writeb); tputs(clr_eol, 1, &writeb);
else
fwprintf(stdout, L"\x1b[K");
fwprintf(stdout, L"\n"); fwprintf(stdout, L"\n");
} }
@ -605,7 +608,13 @@ int job_reap(bool allow_interactive) {
sig2wcs(WTERMSIG(p->status)), sig2wcs(WTERMSIG(p->status)),
signal_get_desc(WTERMSIG(p->status))); signal_get_desc(WTERMSIG(p->status)));
} }
if (cur_term != NULL)
tputs(clr_eol, 1, &writeb); tputs(clr_eol, 1, &writeb);
else
fwprintf(stdout,
L"\x1b[K"); // no term set up - do clr_eol manually
fwprintf(stdout, L"\n"); fwprintf(stdout, L"\n");
} }
found = 1; found = 1;