From 88f02523688bda6c83cc00c79bf6e1c24aba8072 Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 1 Sep 2017 21:15:17 +0200 Subject: [PATCH] avoid segfault when ci handler uses the cs_messenger until neutrino has not register it (thx DboxOldie) --- common/ca_ci.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/ca_ci.cpp b/common/ca_ci.cpp index e111ed2..72772f6 100644 --- a/common/ca_ci.cpp +++ b/common/ca_ci.cpp @@ -49,7 +49,7 @@ static uint8_t NullPMT[50]={0x9F,0x80,0x32,0x2E,0x03,0x6E,0xA7,0x37,0x00,0x00,0x /* die Feinheiten werden ja in CA_MESSAGE verpackt */ uint32_t EVT_CA_MESSAGE = 0x80000000 + 60; -static cs_messenger cam_messenger; +static cs_messenger cam_messenger = NULL; void cs_register_messenger(cs_messenger messenger) { @@ -416,7 +416,8 @@ void cCA::process_tpdu(tSlot* slot, unsigned char tpdu_tag, __u8* data, int asn_ bool cCA::SendMessage(const CA_MESSAGE *msg) { lt_debug("%s\n", __func__); - cam_messenger(EVT_CA_MESSAGE, (uint32_t) msg); + if(cam_messenger) + cam_messenger(EVT_CA_MESSAGE, (uint32_t) msg); #if y_debug printf("*******Message\n"); printf("msg: %p\n", msg);