[tar/f14/master] Remove entry from the hashtable before freeing it.

[Ondrej Vasik]

commit df20e63d69f7bbfe7dcaebeb396203ea78d15c9b
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Wed Mar 23 15:39:03 2011 +0100

    Remove entry from the hashtable before freeing it.

 tar-1.23-hashtable.patch |   11 +++++++++++
 tar.spec                 |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/tar-1.23-hashtable.patch b/tar-1.23-hashtable.patch
new file mode 100644
index 0000000..52a9d1b
--- /dev/null
+++ b/tar-1.23-hashtable.patch
@@ -0,0 +1,11 @@
+diff -urNp tar-1.23-orig/src/names.c tar-1.23/src/names.c
+--- tar-1.23-orig/src/names.c	2011-03-23 15:32:29.210305340 +0100
++++ tar-1.23/src/names.c	2011-03-23 15:34:08.534585984 +0100
+@@ -947,6 +947,7 @@ collect_and_sort_names (void)
+ 		{
+ 		  if (p->child)
+ 		    rebase_child_list (p->child, name);
++                  hash_delete (nametab, name);
+ 		  /* FIXME: remove_directory (p->caname); ? */
+ 		  remname (p);
+ 		  free_name (p);
diff --git a/tar.spec b/tar.spec
index 59cd5c4..53938b0 100644
--- a/tar.spec
+++ b/tar.spec
@@ -5,7 +5,7 @@ Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
 Version: 1.23
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -37,6 +37,8 @@ Patch8: tar-1.23-longnames.patch
 Patch9: tar-1.23-listedincremental.patch
 #match non-stripped file names (#637085)
 Patch10: tar-1.23-stripcomponents.patch
+#Remove entry from the table before freeing it.
+Patch11: tar-1.23-hashtable.patch
 Requires: info
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel gawk rsh
 %if %{WITH_SELINUX}
@@ -70,6 +72,7 @@ the rmt package.
 %patch8 -p1 -b .longnames
 %patch9 -p1 -b .listedincremental
 %patch10 -p1 -b .stripcomponents
+%patch11 -p1 -b .hashtable
 
 autoreconf
 
@@ -131,6 +134,10 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Wed Mar 23 2011 Ondrej Vasik <ovasik at redhat.com> 2:1.23-8
+- Remove entry from the table before freeing it (crashfix
+  based on comment added to #652939)
+
 * Mon Nov 15 2010 Ondrej Vasik <ovasik at redhat.com> 2:1.23-7
 - fix crash in listed incremental when archive includes
   root directory(#652939)