svn commit: r305641 - in head/devel/libhtp: . files

[Ryan Steinmetz]

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;
+ }