adam/znc
1
0 Fork 0
mirror of https://github.com/znc/znc.git synced 2026-10-31 01:32:02 +01:00
Code Issues 362 Packages Projects Releases Wiki Activity

crypt: Modernize and add test. Fix OnNumericMessage 332 issue.

Browse Source 
It was possible to trigger null pointer dereference during
OnNumericMessage

The affected versions are 1.7.0+

CVE-2026-82374
This commit is contained in:
RealKindOne authored and Alexey Sokolov committed 2026-09-12 19:08:21 +01:00
1 parent 4b88c64c6e
commit af5cdd0192
2 files changed
+110 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/crypt.cpp
+37 -16
View File
@@ -248,13 +248,19 @@ class CCryptMod : public CModule {
FilterOutgoing(Message);
return CONTINUE;
}
EModRet OnPrivTextMessage(CTextMessage& Message) override {
CNick& Nick = Message.GetNick();
CString sMessage = Message.GetText();
CString sHostmask = Nick.GetHostMask();
EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
FilterIncoming(Nick.GetNick(), Nick, sMessage);
Message.SetText(sMessage);
return CONTINUE;
}
EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
EModRet OnPrivNoticeMessage(CNoticeMessage& Message) override {
CNick& Nick = Message.GetNick();
CString sMessage = Message.GetText();
CString sCommand = sMessage.Token(0);
CString sOtherPubKey = sMessage.Token(1);
@@ -305,33 +311,42 @@ class CCryptMod : public CModule {
}
FilterIncoming(Nick.GetNick(), Nick, sMessage);
Message.SetText(sMessage);
return CONTINUE;
}
EModRet OnPrivAction(CNick& Nick, CString& sMessage) override {
FilterIncoming(Nick.GetNick(), Nick, sMessage);
EModRet OnPrivActionMessage(CActionMessage& Message) override {
CString sText = Message.GetText();
FilterIncoming(Message.GetNick().GetNick(), Message.GetNick(), sText);
Message.SetText(sText);
return CONTINUE;
}
EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
FilterIncoming(Channel.GetName(), Nick, sMessage);
EModRet OnChanTextMessage(CTextMessage& Message) override {
CString sText = Message.GetText();
FilterIncoming(Message.GetTarget(), Message.GetNick(), sText);
Message.SetText(sText);
return CONTINUE;
}
EModRet OnChanNotice(CNick& Nick, CChan& Channel,
CString& sMessage) override {
FilterIncoming(Channel.GetName(), Nick, sMessage);
EModRet OnChanNoticeMessage(CNoticeMessage& Message) override {
CString sText = Message.GetText();
FilterIncoming(Message.GetTarget(), Message.GetNick(), sText);
Message.SetText(sText);
return CONTINUE;
}
EModRet OnChanAction(CNick& Nick, CChan& Channel,
CString& sMessage) override {
FilterIncoming(Channel.GetName(), Nick, sMessage);
EModRet OnChanActionMessage(CActionMessage& Message) override {
CString sText = Message.GetText();
FilterIncoming(Message.GetTarget(), Message.GetNick(), sText);
Message.SetText(sText);
return CONTINUE;
}
EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sMessage) override {
FilterIncoming(Channel.GetName(), Nick, sMessage);
EModRet OnTopicMessage(CTopicMessage& Message) override {
CString sText = Message.GetText();
FilterIncoming(Message.GetTarget(), Message.GetNick(), sText);
Message.SetText(sText);
return CONTINUE;
}
@@ -342,10 +357,16 @@ class CCryptMod : public CModule {
CChan* pChan = GetNetwork()->FindChan(Message.GetParam(1));
if (pChan) {
CNick* Nick = pChan->FindNick(Message.GetParam(0));
CNick* pNick = pChan->FindNick(Message.GetParam(0));
CString sTopic = Message.GetParam(2);
FilterIncoming(pChan->GetName(), *Nick, sTopic);
if (pNick) {
FilterIncoming(pChan->GetName(), *pNick, sTopic);
} else {
// 332 can arrive before ZNC has this nick in the nicklist.
CNick TempNick(Message.GetParam(0));
FilterIncoming(pChan->GetName(), TempNick, sTopic);
}
Message.SetParam(2, sTopic);
}