From 847b73e56d9d3fc95b4882c935a81da532dda26e Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 27 May 2013 23:48:23 +0400 Subject: [PATCH] Fix NULL pointer dereference in webadmin. Triggerable by any non-admin, if webadmin is loaded. The only affected version is 1.0 Thanks to ChauffeR (Simone Esposito) for reporting this. (cherry picked from commit 2bd410ee5570cea127233f1133ea22f25174eb28) --- modules/webadmin.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp index d8a3d82..ea44060 100644 --- a/modules/webadmin.cpp +++ b/modules/webadmin.cpp @@ -404,7 +404,7 @@ public: 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 @@ public: 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 @@ public: 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 @@ public: 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; } -- 1.8.2.3