From a7debe7ff663ac59427413693156b678d2ecc02c Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Tue, 16 Jun 2026 10:53:40 +0200 Subject: [PATCH] - Fix that after shared memory cannot be created, from `shm-enable`, the server does not crash. Thanks to Qifan Zhang, Palo Alto Networks, for the report. --- doc/Changelog | 3 +++ util/shm_side/shm_main.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/doc/Changelog b/doc/Changelog index 742ae0100..be8b53778 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -50,6 +50,9 @@ - Fix that after malloc failure in find_tag_datas, the local_alias is cleaned up. Thanks to Qifan Zhang, Palo Alto Networks, for the report. + - Fix that after shared memory cannot be created, from + `shm-enable`, the server does not crash. Thanks to Qifan + Zhang, Palo Alto Networks, for the report. 15 June 2026: Wouter - Fix to add `max-transfer-size` and `max-transfer-time` that diff --git a/util/shm_side/shm_main.c b/util/shm_side/shm_main.c index ec0231b12..736f14ca5 100644 --- a/util/shm_side/shm_main.c +++ b/util/shm_side/shm_main.c @@ -351,6 +351,8 @@ void shm_main_run(struct worker *worker) int offset; double total_mesh_time_median; struct shm_main_info* shm_info = worker->daemon->shm_info; + if(!shm_info) + return; #ifndef S_SPLINT_S verbose(VERB_DETAIL, "SHM run - worker [%d] - daemon [%p] - timenow(%u) - timeboot(%u)",