diff options
| author | Jase Thew <jase@FreeBSD.org> | 2013-05-28 14:21:35 +0000 |
|---|---|---|
| committer | Jase Thew <jase@FreeBSD.org> | 2013-05-28 14:21:35 +0000 |
| commit | 3b928a9984595491591aa55d13267aa9e468f044 (patch) | |
| tree | cc3621934ce9a39f0e0110ac46b9cc9e563bef4a /irc | |
| parent | 7ae9607313ad22e962c3164986c0ea732f52803e (diff) | |
- Add patch to fix null pointer dereferences in webadmin module
Reported by: Albert Kult (via email)
Obtained from: https://github.com/znc/znc/commit/2bd410ee5570cea127233f1133ea22f25174eb28
Security: 19751e06-c798-11e2-a373-000c29833058
Notes
Notes:
svn path=/head/; revision=319313
Diffstat (limited to 'irc')
| -rw-r--r-- | irc/znc/Makefile | 1 | ||||
| -rw-r--r-- | irc/znc/files/patch-modules-webadmin_cpp | 38 |
2 files changed, 39 insertions, 0 deletions
diff --git a/irc/znc/Makefile b/irc/znc/Makefile index 93f1e2a00865..eff728ca0366 100644 --- a/irc/znc/Makefile +++ b/irc/znc/Makefile @@ -3,6 +3,7 @@ PORTNAME= znc PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= irc ipv6 MASTER_SITES= http://znc.in/releases/ diff --git a/irc/znc/files/patch-modules-webadmin_cpp b/irc/znc/files/patch-modules-webadmin_cpp new file mode 100644 index 000000000000..dc68df02012b --- /dev/null +++ b/irc/znc/files/patch-modules-webadmin_cpp @@ -0,0 +1,38 @@ +--- modules/webadmin.cpp.orig 2012-11-06 16:02:20.000000000 +0000 ++++ modules/webadmin.cpp 2013-05-28 12:43:53.258581961 +0100 +@@ -404,7 +404,7 @@ + CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); + + // Admin||Self Check +- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { ++ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { + return false; + } + +@@ -433,7 +433,7 @@ + CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); + + // Admin||Self Check +- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { ++ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { + return false; + } + +@@ -457,7 +457,7 @@ + CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); + + // Admin||Self Check +- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { ++ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { + return false; + } + +@@ -471,7 +471,7 @@ + CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); + + // Admin||Self Check +- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { ++ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { + return false; + } + |