From 13704094f00da9e3f64f1f2d3765fb16c6b53aa9 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Nov 25 2011 18:07:08 +0000
Subject: Fixed NULL dereference in selinux patch.


---

diff --git a/patch-selinux.patch b/patch-selinux.patch
index a7920b0..b9891c5 100644
--- a/patch-selinux.patch
+++ b/patch-selinux.patch
@@ -128,7 +128,7 @@ diff -up patch-2.6.1/src/pch.c.selinux patch-2.6.1/src/pch.c
  	validate_target_name (inname);
 +	if (getfilecon (inname, &incontext) == -1)
 +	  if (errno == ENODATA || errno == ENOTSUP)
-+	    *incontext = NULL;
++	    incontext = NULL;
        }
  
      return retval;
diff --git a/patch.spec b/patch.spec
index 85582f6..44f6893 100644
--- a/patch.spec
+++ b/patch.spec
@@ -1,7 +1,7 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.6.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Fri Nov 25 2011 Tim Waugh <twaugh@redhat.com> 2.6.1-11
+- Fixed NULL dereference in selinux patch.
+
 * Mon May 16 2011 Tim Waugh <twaugh@redhat.com> 2.6.1-10
 - Applied Jiri Popelka's fixes from Coverity scan (bug #704554):
   - Avoid unchecked return from getfilecon() in patch-selinux.patch.