From owner-svn-ports-all@FreeBSD.ORG  Wed Oct 10 11:41:36 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 423F5EEE;
 Wed, 10 Oct 2012 11:41:36 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 2A4678FC0A;
 Wed, 10 Oct 2012 11:41:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9ABfaiS019020;
 Wed, 10 Oct 2012 11:41:36 GMT (envelope-from zi@svn.freebsd.org)
Received: (from zi@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9ABfZBe019016;
 Wed, 10 Oct 2012 11:41:35 GMT (envelope-from zi@svn.freebsd.org)
Message-Id: <201210101141.q9ABfZBe019016@svn.freebsd.org>
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Wed, 10 Oct 2012 11:41:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305641 - in head/devel/libhtp: . 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Oct 2012 11:41:36 -0000
X-List-Received-Date: Wed, 10 Oct 2012 11:41:36 -0000

Author: zi
Date: Wed Oct 10 11:41:35 2012
New Revision: 305641
URL: http://svn.freebsd.org/changeset/ports/305641

Log:
  - Add patch to fix null dereference
  - Bump PORTREVISION
  
  Approved by:	wxs@ (maintainer)
  Obtained from:	Upstream bug repo

Added:
  head/devel/libhtp/files/
  head/devel/libhtp/files/patch-htp__htp_util.c   (contents, props changed)
Modified:
  head/devel/libhtp/Makefile

Modified: head/devel/libhtp/Makefile
==============================================================================
--- head/devel/libhtp/Makefile	Wed Oct 10 11:25:06 2012	(r305640)
+++ head/devel/libhtp/Makefile	Wed Oct 10 11:41:35 2012	(r305641)
@@ -7,7 +7,7 @@
 
 PORTNAME=	libhtp
 PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 #MASTER_SITES=	# This port uses github
 

Added: head/devel/libhtp/files/patch-htp__htp_util.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libhtp/files/patch-htp__htp_util.c	Wed Oct 10 11:41:35 2012	(r305641)
@@ -0,0 +1,22 @@
+--- ./htp/htp_util.c.orig	2012-10-09 18:53:48.000000000 -0400
++++ ./htp/htp_util.c	2012-10-09 18:54:31.000000000 -0400
+@@ -2099,7 +2099,8 @@
+         len += bstr_len(hl->line);
+     }
+ 
+-    len += bstr_len(tx->request_headers_sep);
++    if (tx->request_headers_sep)
++        len += bstr_len(tx->request_headers_sep);
+ 
+     request_headers_raw = bstr_alloc(len);
+     if (request_headers_raw == NULL) {
+@@ -2112,7 +2113,8 @@
+         bstr_add_noex(request_headers_raw, hl->line);
+     }
+ 
+-    bstr_add_noex(request_headers_raw, tx->request_headers_sep);
++    if (tx->request_headers_sep)
++        bstr_add_noex(request_headers_raw, tx->request_headers_sep);
+ 
+     return request_headers_raw;
+ }