Gentoo Archives: gentoo-commits

From: "Alex Alexander (wired)" <wired@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-irc/znc/files: znc-0.202-bouncedcc-dos-fix.patch
Date: Sun, 08 Jan 2012 18:20:19
Message-Id: 20120108182008.9B10A2004C@flycatcher.gentoo.org
1 wired 12/01/08 18:20:08
2
3 Added: znc-0.202-bouncedcc-dos-fix.patch
4 Log:
5 security: bouncedcc dos fix - bug #398159
6
7 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-irc/znc/files/znc-0.202-bouncedcc-dos-fix.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/files/znc-0.202-bouncedcc-dos-fix.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/files/znc-0.202-bouncedcc-dos-fix.patch?rev=1.1&content-type=text/plain
14
15 Index: znc-0.202-bouncedcc-dos-fix.patch
16 ===================================================================
17 # Fix crash in bouncedcc module.
18 # It happens when DCC RESUME is received.
19 # Affected ZNC versions: 0.200, 0.202.
20
21 https://bugs.gentoo.org/show_bug.cgi?id=398159
22
23 diff -Naur znc-0.202.orig/modules/bouncedcc.cpp znc-0.202/modules/bouncedcc.cpp
24 --- znc-0.202.orig/modules/bouncedcc.cpp 2011-09-21 22:20:19.000000000 +0200
25 +++ znc-0.202/modules/bouncedcc.cpp 2012-01-07 14:47:20.436704782 +0100
26 @@ -238,7 +238,7 @@
27 CDCCBounce* pSock = (CDCCBounce*) *it;
28
29 if (pSock->GetLocalPort() == uResumePort) {
30 - m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pClient->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetUserPort()) + " " + sMessage.Token(4) + "\001");
31 + m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pUser->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetUserPort()) + " " + sMessage.Token(4) + "\001");
32 }
33 }
34 } else if (sType.Equals("ACCEPT")) {
35 @@ -248,7 +248,7 @@
36 CDCCBounce* pSock = (CDCCBounce*) *it;
37
38 if (pSock->GetUserPort() == sMessage.Token(3).ToUShort()) {
39 - m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pClient->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetLocalPort()) + " " + sMessage.Token(4) + "\001");
40 + m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pUser->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetLocalPort()) + " " + sMessage.Token(4) + "\001");
41 }
42 }
43 }