nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check null in signal handler

Browse Source
This commit is contained in:
john30
2017-12-26 14:15:35 +01:00
parent c680e87bde
commit d610f4ca43
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/main.cpp
+10 -2
View File
@@ -650,11 +650,11 @@ void closePidFile() {
*/ */
void shutdown() { void shutdown() {
// stop main loop and all dependent components // stop main loop and all dependent components
if (s_mainLoop != NULL) { if (s_mainLoop) {
delete s_mainLoop; delete s_mainLoop;
s_mainLoop = NULL; s_mainLoop = NULL;
} }
if (s_messageMap != NULL) { if (s_messageMap) {
delete s_messageMap; delete s_messageMap;
s_messageMap = NULL; s_messageMap = NULL;
} }
@@ -695,11 +695,19 @@ void signalHandler(int sig) {
break; break;
case SIGINT: case SIGINT:
logNotice(lf_main, "SIGINT received"); logNotice(lf_main, "SIGINT received");
if (s_mainLoop) {
s_mainLoop->shutdown(); s_mainLoop->shutdown();
} else {
shutdown();
}
break; break;
case SIGTERM: case SIGTERM:
logNotice(lf_main, "SIGTERM received"); logNotice(lf_main, "SIGTERM received");
if (s_mainLoop) {
s_mainLoop->shutdown(); s_mainLoop->shutdown();
} else {
shutdown();
}
break; break;
default: default:
logNotice(lf_main, "undefined signal %s", strsignal(sig)); logNotice(lf_main, "undefined signal %s", strsignal(sig));