From 63dc1de06b047b4be691541935e98845457c4c04 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sun, 12 May 2013 22:44:11 +0200 Subject: [PATCH] EV: fix possible nullpointer access in last commit. --- citadel/event_client.c | 3 ++- citadel/modules/rssclient/serv_rssclient.c | 3 ++- citadel/modules/smtp/serv_smtpeventclient.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/citadel/event_client.c b/citadel/event_client.c index fdd66d7ae..68995ddf7 100644 --- a/citadel/event_client.c +++ b/citadel/event_client.c @@ -101,7 +101,8 @@ void SetEVState(AsyncIO *IO, eIOState State) { CitContext* CCC = IO->CitContext; - memcpy(CCC->lastcmdname, IOStates[State].Key, IOStates[State].len + 1); + if (CCC != NULL) + memcpy(CCC->lastcmdname, IOStates[State].Key, IOStates[State].len + 1); } diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c index 10e71dcfb..d15613d49 100644 --- a/citadel/modules/rssclient/serv_rssclient.c +++ b/citadel/modules/rssclient/serv_rssclient.c @@ -111,7 +111,8 @@ ConstStr RSSStates[] = { static void SetRSSState(AsyncIO *IO, RSSState State) { CitContext* CCC = IO->CitContext; - memcpy(CCC->cs_clientname, RSSStates[State].Key, RSSStates[State].len + 1); + if (CCC != NULL) + memcpy(CCC->cs_clientname, RSSStates[State].Key, RSSStates[State].len + 1); } void DeleteRoomReference(long QRnumber) diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c index b3ec5da0e..dd4e3e266 100644 --- a/citadel/modules/smtp/serv_smtpeventclient.c +++ b/citadel/modules/smtp/serv_smtpeventclient.c @@ -108,7 +108,8 @@ ConstStr SMTPStates[] = { void SetSMTPState(AsyncIO *IO, smtpstate State) { CitContext* CCC = IO->CitContext; - memcpy(CCC->cs_clientname, SMTPStates[State].Key, SMTPStates[State].len + 1); + if (CCC != NULL) + memcpy(CCC->cs_clientname, SMTPStates[State].Key, SMTPStates[State].len + 1); } int SMTPClientDebugEnabled = 0; -- 2.30.2