emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

top: move free(prev_hist) out of signal path

Browse Source 
It was seen being called recursively on repeated signals,
leading to double free

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-08-19 11:07:31 +02:00
parent b11be131b7
commit aedc3fe19f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
procps/top.c
View File

@ -728,12 +728,6 @@ static void reset_term(void)
{ {
if (!OPT_BATCH_MODE) if (!OPT_BATCH_MODE)
tcsetattr_stdin_TCSANOW(&initial_settings); tcsetattr_stdin_TCSANOW(&initial_settings);
if (ENABLE_FEATURE_CLEAN_UP) {
clearmems();
# if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
free(prev_hist);
# endif
}
} }
static void sig_catcher(int sig) static void sig_catcher(int sig)
@ -1258,5 +1252,11 @@ int top_main(int argc UNUSED_PARAM, char **argv)
#if ENABLE_FEATURE_USE_TERMIOS #if ENABLE_FEATURE_USE_TERMIOS
reset_term(); reset_term();
#endif #endif
if (ENABLE_FEATURE_CLEAN_UP) {
clearmems();
#if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
free(prev_hist);
#endif
}
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }