- 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.

diff --git a/doc/Changelog b/doc/Changelog
index 742ae01006ba4542e9977a5c850cb077bce3f707..be8b537781d8fda41a278d9402678e15a184e84d 100644 (file)
--- 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 ec0231b121b76fed58da9a232137f46481aee6b3..736f14ca55f969193ce8da1012f3913138cf3225 100644 (file)
--- 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)",