From owner-svn-ports-head@FreeBSD.ORG  Tue May 28 14:21:36 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0B4DBAF2;
 Tue, 28 May 2013 14:21:36 +0000 (UTC)
 (envelope-from jase@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D7EC2E98;
 Tue, 28 May 2013 14:21:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4SELZGY002083;
 Tue, 28 May 2013 14:21:35 GMT (envelope-from jase@svn.freebsd.org)
Received: (from jase@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4SELZZa002078;
 Tue, 28 May 2013 14:21:35 GMT (envelope-from jase@svn.freebsd.org)
Message-Id: <201305281421.r4SELZZa002078@svn.freebsd.org>
From: Jase Thew <jase@FreeBSD.org>
Date: Tue, 28 May 2013 14:21:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319313 - in head/irc/znc: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 May 2013 14:21:36 -0000

Author: jase
Date: Tue May 28 14:21:35 2013
New Revision: 319313
URL: http://svnweb.freebsd.org/changeset/ports/319313

Log:
  - 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

Added:
  head/irc/znc/files/patch-modules-webadmin_cpp   (contents, props changed)
Modified:
  head/irc/znc/Makefile

Modified: head/irc/znc/Makefile
==============================================================================
--- head/irc/znc/Makefile	Tue May 28 14:07:30 2013	(r319312)
+++ head/irc/znc/Makefile	Tue May 28 14:21:35 2013	(r319313)
@@ -3,6 +3,7 @@
 
 PORTNAME=	znc
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://znc.in/releases/
 

Added: head/irc/znc/files/patch-modules-webadmin_cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/znc/files/patch-modules-webadmin_cpp	Tue May 28 14:21:35 2013	(r319313)
@@ -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;
+ 			}
+