mirror of
https://github.com/znc/znc.git
synced 2026-03-28 17:42:41 +01:00
9f1f8950f8
When you are already in #znc and you did 'stick znc' (# prefix missing!), stickychan caused segfaults or different weird behavior. This happened because stickychan didn't handle errors from CUser::AddChan(). AddChan() can only error out if the channel already exists, but since stickychan already checked this, were does the error come from? CChan's constructor does some sanity checks on the channel name. It automatically adds the proper channel prefix (most likely #) if it's missing. This means when stickychan checked for the channel "znc" it correctly didn't find one. When it then tried to add "znc", it really tried adding "#znc" which could fail if the channel was already added. Thanks to DM8Mydog for finding this. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1500 726aef4b-f618-498e-8847-2d620e286838
120 lines
2.7 KiB
C++
120 lines
2.7 KiB
C++
/*
|
|
* Copyright (C) 2004-2009 See the AUTHORS file for details.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 as published
|
|
* by the Free Software Foundation.
|
|
*/
|
|
|
|
#include "Chan.h"
|
|
#include "User.h"
|
|
|
|
class CStickyChan : public CModule
|
|
{
|
|
public:
|
|
MODCONSTRUCTOR(CStickyChan) {}
|
|
virtual ~CStickyChan()
|
|
{
|
|
}
|
|
|
|
virtual bool OnLoad(const CString& sArgs, CString& sMessage);
|
|
|
|
virtual EModRet OnUserPart(CString& sChannel, CString& sMessage)
|
|
{
|
|
for (MCString::iterator it = BeginNV(); it != EndNV(); it++)
|
|
{
|
|
if (sChannel.Equals(it->first))
|
|
{
|
|
CChan* pChan = m_pUser->FindChan(sChannel);
|
|
|
|
if (pChan)
|
|
{
|
|
pChan->JoinUser(true, "", m_pClient);
|
|
return HALT;
|
|
}
|
|
}
|
|
}
|
|
|
|
return CONTINUE;
|
|
}
|
|
|
|
virtual void OnModCommand(const CString& sCommand)
|
|
{
|
|
CString sCmdName = sCommand.Token(0);
|
|
CString sChannel = sCommand.Token(1);
|
|
sChannel.MakeLower();
|
|
if ((sCmdName == "stick") && (!sChannel.empty()))
|
|
{
|
|
SetNV(sChannel, sCommand.Token(2));
|
|
PutModule("Stuck " + sChannel);
|
|
}
|
|
else if ((sCmdName == "unstick") && (!sChannel.empty()))
|
|
{
|
|
MCString::iterator it = FindNV(sChannel);
|
|
if (it != EndNV())
|
|
DelNV(it);
|
|
|
|
PutModule("UnStuck " + sChannel);
|
|
}
|
|
else if ((sCmdName == "list") && (sChannel.empty()))
|
|
{
|
|
int i = 1;
|
|
for (MCString::iterator it = BeginNV(); it != EndNV(); it++, i++)
|
|
{
|
|
if (it->second.empty())
|
|
PutModule(CString(i) + ": " + it->first);
|
|
else
|
|
PutModule(CString(i) + ": " + it->first + " (" + it->second + ")");
|
|
}
|
|
PutModule(" -- End of List");
|
|
}
|
|
else
|
|
{
|
|
PutModule("USAGE: [un]stick #channel [key], list");
|
|
}
|
|
}
|
|
|
|
virtual void RunJob()
|
|
{
|
|
if (!m_pUser->GetIRCSock())
|
|
return;
|
|
|
|
for (MCString::iterator it = BeginNV(); it != EndNV(); it++)
|
|
{
|
|
CChan *pChan = m_pUser->FindChan(it->first);
|
|
if (!pChan) {
|
|
pChan = new CChan(it->first, m_pUser, true);
|
|
if (!it->second.empty())
|
|
pChan->SetKey(it->second);
|
|
if (!m_pUser->AddChan(pChan)) {
|
|
/* AddChan() deleted that channel */
|
|
PutModule("Could not join [" + it->first
|
|
+ "] (# prefix missing?)");
|
|
continue;
|
|
}
|
|
}
|
|
if (!pChan->IsOn()) {
|
|
PutModule("Joining [" + pChan->GetName() + "]");
|
|
PutIRC("JOIN " + pChan->GetName() + (pChan->GetKey().empty()
|
|
? "" : " " + pChan->GetKey()));
|
|
}
|
|
}
|
|
}
|
|
private:
|
|
|
|
};
|
|
|
|
|
|
static void RunTimer(CModule * pModule, CFPTimer *pTimer)
|
|
{
|
|
((CStickyChan *)pModule)->RunJob();
|
|
}
|
|
|
|
bool CStickyChan::OnLoad(const CString& sArgs, CString& sMessage)
|
|
{
|
|
AddTimer(RunTimer, "StickyChanTimer", 15);
|
|
return(true);
|
|
}
|
|
|
|
MODULEDEFS(CStickyChan, "configless sticky chans, keeps you there very stickily even")
|