This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/7.1.x by this push:
new 71d2261 TS-4195: double free on exit
71d2261 is described below
commit 71d226122294716e488922833f305a049b90db30
Author: Zizhong Zhang <[email protected]>
AuthorDate: Fri Mar 10 11:19:51 2017 -0800
TS-4195: double free on exit
(cherry picked from commit 1a7c0fc8cdf5ed48870e1507bf337fb2e711226f)
Conflicts:
lib/ts/signals.cc
---
iocore/eventsystem/I_EThread.h | 2 +-
iocore/eventsystem/UnixEThread.cc | 2 +-
lib/ts/signals.cc | 10 ++--------
proxy/Main.cc | 2 --
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/iocore/eventsystem/I_EThread.h b/iocore/eventsystem/I_EThread.h
index 777c759..a502c5c 100644
--- a/iocore/eventsystem/I_EThread.h
+++ b/iocore/eventsystem/I_EThread.h
@@ -53,7 +53,7 @@ enum ThreadType {
DEDICATED,
};
-extern bool shutdown_event_system;
+extern volatile bool shutdown_event_system;
/**
Event System specific type of thread.
diff --git a/iocore/eventsystem/UnixEThread.cc
b/iocore/eventsystem/UnixEThread.cc
index 8206e3f..6fdc480 100644
--- a/iocore/eventsystem/UnixEThread.cc
+++ b/iocore/eventsystem/UnixEThread.cc
@@ -39,7 +39,7 @@ struct AIOCallback;
#define THREAD_MAX_HEARTBEAT_MSECONDS 60
#define NO_ETHREAD_ID -1
-bool shutdown_event_system = false;
+volatile bool shutdown_event_system = false;
EThread::EThread()
: generator((uint64_t)Thread::get_hrtime_updated() ^
(uint64_t)(uintptr_t)this),
diff --git a/lib/ts/signals.cc b/lib/ts/signals.cc
index dba800c..3980d27 100644
--- a/lib/ts/signals.cc
+++ b/lib/ts/signals.cc
@@ -162,13 +162,7 @@ signal_format_siginfo(int signo, siginfo_t *info, const
char *msg)
(void)info;
(void)signo;
-#if HAVE_PSIGINFO
- psiginfo(info, const_cast<char *>(msg));
-#elif HAVE_PSIGNAL
- psignal(signo, msg);
-#else
char buf[64];
- size_t len;
#if HAVE_STRSIGNAL
snprintf(buf, sizeof(buf), "%s: received signal %d (%s)\n", msg, signo,
strsignal(signo));
@@ -176,8 +170,8 @@ signal_format_siginfo(int signo, siginfo_t *info, const
char *msg)
snprintf(buf, sizeof(buf), "%s: received signal %d\n", msg, signo);
#endif
- write(STDERR_FILENO, buf, strlen(buf));
-#endif
+ ssize_t ignored = write(STDERR_FILENO, buf, strlen(buf));
+ (void)ignored; // because gcc and glibc are stupid, "(void)write(...)"
doesn't suffice.
}
void
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 6937626..ed68c15 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -459,8 +459,6 @@ proxy_signal_handler(int signo, siginfo_t *info, void *ctx)
shutdown_event_system = true;
sleep(1);
-
- ::exit(signo);
}
//
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
