From 1be63b156a639d0522ee9b4406c1047aa0376b5f Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@fedoraproject.org>
Date: Thu, 1 Jul 2010 14:13:38 +0000
Subject: [PATCH] - Add a patch by Steve Kemp @debian that might fix the double
 free problem. - Related: #609806

---
 make-3.81-double-free.patch | 13 +++++++++++++
 make.spec                   |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 make-3.81-double-free.patch

diff --git a/make-3.81-double-free.patch b/make-3.81-double-free.patch
new file mode 100644
index 0000000..3c3aacb
--- /dev/null
+++ b/make-3.81-double-free.patch
@@ -0,0 +1,13 @@
+diff -up /home/petr/fedora/make/devel/make-3.81/read.c\~ /home/petr/fedora/make/devel/make-3.81/read.c
+--- make-3.81/read.c~	2010-07-01 16:01:34.000000000 +0200
++++ make-3.81/read.c	2010-07-01 16:02:29.000000000 +0200
+@@ -3136,6 +3136,7 @@ multi_glob (struct nameseq *chain, unsig
+ 		      }
+ 
+ 		    free (memname);
++		    memname = 0;
+ 		  }
+ 		else
+ #endif /* !NO_ARCHIVES */
+
+Diff finished.  Thu Jul  1 16:02:44 2010
diff --git a/make.spec b/make.spec
index e11e53f..65180db 100644
--- a/make.spec
+++ b/make.spec
@@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users
 Name: make
 Epoch: 1
 Version: 3.81
-Release: 19%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -19,6 +19,7 @@ Patch10: make-3.81-jobserver.patch
 Patch11: make-3.81-fdleak.patch
 Patch12: make-3.81-strcpy-overlap.patch
 Patch13: make-3.81-recursion-test.patch
+Patch14: make-3.81-double-free.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -44,6 +45,7 @@ makefile.
 %patch11 -p1
 %patch12 -p0
 %patch13 -p1
+%patch14 -p1
 
 %build
 %configure
@@ -86,6 +88,11 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Thu Jul  1 2010 Petr Machata <pmachata@redhat.com> - 1:3.81-20
+- Add a patch by Steve Kemp @debian that might fix the double free
+  problem.
+- Related: #609806
+
 * Fri Jun  4 2010 Petr Machata <pmachata@redhat.com> - 1:3.81-19
 - Fix testsuite on F13
 - Resolves: #600004