[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-74-gd516495

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 454560118ad74cc0928c072a7a7b74d8b95b1c42
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Apr 28 15:10:04 2012 -0400

    Fix cve-2011-4539: error in regular expression handling
    (closes: #652259)

diff --git a/debian/patches/cve-2011-4539.patch b/debian/patches/cve-2011-4539.patch
new file mode 100644
index 0000000..dd4f6eb
--- /dev/null
+++ b/debian/patches/cve-2011-4539.patch
@@ -0,0 +1,16 @@
+Description: Fix cve-2011-4539: error in regular expression handling
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2011-4539
+Bug-Debian: http://bugs.debian.org/652259
+
+Index: isc-dhcp/common/tree.c
+===================================================================
+--- isc-dhcp.orig/common/tree.c	2012-04-28 15:01:08.000000000 -0400
++++ isc-dhcp/common/tree.c	2012-04-28 15:02:19.000000000 -0400
+@@ -1120,6 +1120,7 @@
+ 		*result = 0;
+ 		memset(&re, 0, sizeof(re));
+ 		if (bleft && bright &&
++		    (left.data != NULL) && (right.data != NULL) &&
+         	    (regcomp(&re, (char *)right.data, regflags) == 0) &&
+ 		    (regexec(&re, (char *)left.data, (size_t)0, NULL, 0) == 0))
+ 				*result = 1;
diff --git a/debian/patches/series b/debian/patches/series
index 01a06ba..d2ff4ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ dhclient-script-exit-status
 fix_exit_hook_doc_manpage
 no_loopback_checksum
 bind-autoconf
+cve-2011-4539.patch

-- 
ISC DHCP packaging for Debian