Update of znc for 4.0r4 - fixes two crash bugs
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hello,
I applied two upstream patches for znc 0.045-3 in Etch and set myself as
the new maintainer of the package (Joey Hess orphaned the package and I
adopted it).
dsc: http://packages.linux-dev.org/znc_0.045-3+etch1.dsc
Could you please release this update with Etch r4?
Changes:
* Set myself as new maintainer.
* Applied two patches from upstream which fixes two crash bugs:
- - Crash bug when doing /nick while not connected to IRC (NULL pointer).
- - Crash bug when using *status while not connected to IRC (NULL pointer).
debdiff:
diff -u znc-0.045/Client.cpp znc-0.045/Client.cpp
- --- znc-0.045/Client.cpp
+++ znc-0.045/Client.cpp
@@ -58,6 +58,11 @@
return; // Don't forward this msg. ZNC will handle nick changes
until auth is complete
}
+ if (!m_pIRCSock) {
+ // No need to check against IRC nick or to forward it
+ return;
+ }
+
if ((m_pUser) && (sNick.CaseCmp(m_pUser->GetNick()) == 0)) {
m_uKeepNickCounter++;
// If the user is changing his nick to the conifg nick, set keepnick
to the config value
@@ -531,7 +536,8 @@
}
const map<CString,CNick*>& msNicks = pChan->GetNicks();
- - const CString& sPerms = m_pUser->GetIRCSock()->GetPerms();
+ CIRCSock* pIRCSock = (!m_pUser) ? NULL : m_pUser->GetIRCSock();
+ const CString& sPerms = (pIRCSock) ? pIRCSock->GetPerms() : "";
if (!msNicks.size()) {
PutStatus("No nicks on [" + sChan + "]");
@@ -716,7 +722,9 @@
} else if (sCommand.CaseCmp("LISTCHANS") == 0) {
if (m_pUser) {
const vector<CChan*>& vChans = m_pUser->GetChans();
- - const CString& sPerms = m_pUser->GetIRCSock()->GetPerms();
+
+ CIRCSock* pIRCSock = (!m_pUser) ? NULL : m_pUser->GetIRCSock();
+ const CString& sPerms = (pIRCSock) ? pIRCSock->GetPerms() : "";
if (!vChans.size()) {
PutStatus("You have no channels defined");
diff -u znc-0.045/debian/changelog znc-0.045/debian/changelog
- --- znc-0.045/debian/changelog
+++ znc-0.045/debian/changelog
@@ -1,3 +1,12 @@
+znc (0.045-3+etch1) stable; urgency=low
+
+ * Set myself as new maintainer.
+ * Applied two patches from upstream which fixes two crash bugs:
+ - Crash bug when doing /nick while not connected to IRC (NULL pointer).
+ - Crash bug when using *status while not connected to IRC (NULL
pointer).
+
+ -- Patrick Matthäi <patrick.matthaei@web.de> Fri, 13 Jun 2008
21:49:31 +0100
+
znc (0.045-3) unstable; urgency=high
* Apply patch from CVS to fix a security hole that allowed a logged-in
diff -u znc-0.045/debian/control znc-0.045/debian/control
- --- znc-0.045/debian/control
+++ znc-0.045/debian/control
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Build-Depends: debhelper (>= 5), libssl-dev, libperl-dev, autotools-dev
- -Maintainer: Joey Hess <joeyh@debian.org>
+Maintainer: Patrick Matthäi <patrick.matthaei@web.de>
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.kitenet.net/joey/trunk/src/packages/znc
- --
Mit freundlichem Gruß / With kind regards,
Patrick Matthäi
E-Mail: patrick.matthaei@web.de
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkhS2OQACgkQ2XA5inpabMdnHgCgnhNRmd5pMNv7jQ6ItmLQbGtD
1ZIAoKF4tgUDkbzAAFKs/sKJ81KMXkwe
=fIuN
-----END PGP SIGNATURE-----
Reply to: