zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent null pointer dereference on early error 

If a fatal error occurs before CRT_init has been called, CRT_done
dereferences NULL in CRT_colors.

Simply check if CRT_crashSettings is not NULL, which is eventually
set when CRT_init has been called.

If it is not set, then do not try to disable ncurses.

Proof of Concept (on Linux):

$ ./configure --with-proc=/var/empty
$ make
$ ./htop
This commit is contained in:
Tobias Stoeckmann 2022-06-02 23:46:21 +02:00 committed by BenBE
parent 4e6ec4a087
commit 611ea4606f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CRT.c
View File

@ -1013,9 +1013,11 @@ IGNORE_WCASTQUAL_END
} }
void CRT_done() { void CRT_done() {
attron(CRT_colors[RESET_COLOR]); int resetColor = CRT_colors ? CRT_colors[RESET_COLOR] : CRT_colorSchemes[COLORSCHEME_DEFAULT][RESET_COLOR];
attron(resetColor);
mvhline(LINES - 1, 0, ' ', COLS); mvhline(LINES - 1, 0, ' ', COLS);
attroff(CRT_colors[RESET_COLOR]); attroff(resetColor);
refresh(); refresh();
curs_set(1); curs_set(1);