top: move free(prev_hist) out of signal path

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

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/procps/top.c b/procps/top.c
index 73cd285f0fc5550e7f8f516d3b22d15143c255a3..6f7f7d382542ff9095ec844d11a2c4dc3b89a1e9 100644 (file)
--- a/procps/top.c
+++ b/procps/top.c
@@ -728,12 +728,6 @@ static void reset_term(void)
 {
        if (!OPT_BATCH_MODE)
                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)
@@ -1258,5 +1252,11 @@ int top_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_USE_TERMIOS
        reset_term();
 #endif
+       if (ENABLE_FEATURE_CLEAN_UP) {
+               clearmems();
+#if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+               free(prev_hist);
+#endif
+       }
        return EXIT_SUCCESS;
 }