|
@@ -1,48 +0,0 @@
|
|
|
-From aedc3fe19fac368dc363050e0387d263b7e01cc6 Mon Sep 17 00:00:00 2001
|
|
|
-From: Denys Vlasenko <vda.linux@googlemail.com>
|
|
|
-Date: Fri, 19 Aug 2016 11:07:31 +0200
|
|
|
-Subject: [PATCH] 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>
|
|
|
-Backported-from: https://git.busybox.net/busybox/commit/?id=aedc3fe19fac368dc363050e0387d263b7e01cc6
|
|
|
-Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
|
|
|
-
|
|
|
----
|
|
|
- procps/top.c | 12 ++++++------
|
|
|
- 1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
-
|
|
|
-diff --git a/procps/top.c b/procps/top.c
|
|
|
-index 73cd285..6f7f7d3 100644
|
|
|
---- 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;
|
|
|
- }
|
|
|
---
|
|
|
-2.7.4
|
|
|
-
|