75963a8e86
Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com> (cherry picked from commit b01474022f935c55473f71b9f92f7f36fd8fd708)
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From d38e4b7bfc5bd0137914859837dcc04076b9e1ea Mon Sep 17 00:00:00 2001
|
|
From: Wang Haitao <45086632+apple-ouyang@users.noreply.github.com>
|
|
Date: Fri, 20 Sep 2024 17:50:37 +0800
|
|
Subject: [PATCH] Fix runConf NULL pointer refence
|
|
|
|
`systemd restart rsyslog` in the early start of OS will let rsyslog segmentation fault.
|
|
This cmd will send sigTerm to rsylogd, and rsyslogd will handle the signal in rsyslogdDoDie.
|
|
If the rsyslogd havn't parse the conf, the runConf will be NULL
|
|
So check the pointer before reference it.
|
|
---
|
|
tools/rsyslogd.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c
|
|
index ed81df3a7..1340b1e62 100644
|
|
--- a/tools/rsyslogd.c
|
|
+++ b/tools/rsyslogd.c
|
|
@@ -2013,7 +2013,7 @@ rsyslogdDoDie(int sig)
|
|
abort();
|
|
}
|
|
bFinished = sig;
|
|
- if(runConf->globals.debugOnShutdown) {
|
|
+ if(runConf && runConf->globals.debugOnShutdown) {
|
|
/* kind of hackish - set to 0, so that debug_swith will enable
|
|
* and AND emit the "start debug log" message.
|
|
*/
|
|
--
|
|
2.33.0
|
|
|