| 1 |
wired 13/05/28 14:27:49 |
| 2 |
|
| 3 |
Added: znc-1.0-webadmin-null-pointer-dereference-fix.patch |
| 4 |
Removed: znc-0.098-modpython-as-needed.patch |
| 5 |
znc-0.200-segfault-fix.patch |
| 6 |
znc-0.096-clearbuffersonmsg-fix.patch |
| 7 |
znc-0.202-bouncedcc-dos-fix.patch |
| 8 |
Log: |
| 9 |
added fix for a NULL pointer dereference in webadmin. removed old patches. |
| 10 |
|
| 11 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key EB9B4AFA) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.1 net-irc/znc/files/znc-1.0-webadmin-null-pointer-dereference-fix.patch |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/files/znc-1.0-webadmin-null-pointer-dereference-fix.patch?rev=1.1&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/files/znc-1.0-webadmin-null-pointer-dereference-fix.patch?rev=1.1&content-type=text/plain |
| 18 |
|
| 19 |
Index: znc-1.0-webadmin-null-pointer-dereference-fix.patch |
| 20 |
=================================================================== |
| 21 |
Fix NULL pointer dereference in webadmin. |
| 22 |
|
| 23 |
https://github.com/znc/znc/commit/2bd410ee5570cea127233f1133ea22f25174eb28 |
| 24 |
--- modules/webadmin.cpp |
| 25 |
+++ modules/webadmin.cpp |
| 26 |
@@ -404,7 +426,7 @@ |
| 27 |
CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); |
| 28 |
|
| 29 |
// Admin||Self Check |
| 30 |
- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { |
| 31 |
+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { |
| 32 |
return false; |
| 33 |
} |
| 34 |
|
| 35 |
@@ -433,7 +455,7 @@ |
| 36 |
CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); |
| 37 |
|
| 38 |
// Admin||Self Check |
| 39 |
- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { |
| 40 |
+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { |
| 41 |
return false; |
| 42 |
} |
| 43 |
|
| 44 |
@@ -457,7 +479,7 @@ |
| 45 |
CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); |
| 46 |
|
| 47 |
// Admin||Self Check |
| 48 |
- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { |
| 49 |
+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { |
| 50 |
return false; |
| 51 |
} |
| 52 |
|
| 53 |
@@ -471,7 +493,7 @@ |
| 54 |
CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); |
| 55 |
|
| 56 |
// Admin||Self Check |
| 57 |
- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { |
| 58 |
+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { |
| 59 |
return false; |
| 60 |
} |
Archives