From 562e3ad719ee28b6ae8c4999fb9087edef15149d Mon Sep 17 00:00:00 2001
From: vcrhonek <vcrhonek@fedoraproject.org>
Date: Mon, 2 Jun 2008 13:00:14 +0000
Subject: [PATCH] Fix install-info crashes on some info files

---
 texinfo-4.12-install-info_crash.patch | 12 ++++++++++++
 texinfo.spec                          |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 texinfo-4.12-install-info_crash.patch

diff --git a/texinfo-4.12-install-info_crash.patch b/texinfo-4.12-install-info_crash.patch
new file mode 100644
index 0000000..0111fbe
--- /dev/null
+++ b/texinfo-4.12-install-info_crash.patch
@@ -0,0 +1,12 @@
+diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/install-info.c
+--- texinfo-4.12/install-info/install-info.c_old	2008-06-02 13:00:35.000000000 +0200
++++ texinfo-4.12/install-info/install-info.c	2008-06-02 13:01:18.000000000 +0200
+@@ -1465,7 +1465,7 @@ split_entry (char *entry, char **name, s
+       size_t length = strlen (entry);
+       if (length == 0)
+         return;
+-      *name = strdup (ptr);
++      *name = strdup (entry);
+       *name_len = length + 1;
+       return;
+     }
diff --git a/texinfo.spec b/texinfo.spec
index 428d3b2..5bbee05 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -11,6 +11,7 @@ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.gz
 Source1: info-dir
 Source2: texi2pdf.man
 Patch0: texinfo-4.12-zlib.patch
+Patch1: texinfo-4.12-install-info_crash.patch
 Requires(post): /sbin/install-info
 Requires(post): /bin/sed
 Requires(preun): /sbin/install-info
@@ -54,6 +55,7 @@ for printing using TeX.
 %prep
 %setup -q
 %patch0 -p1 -b .zlib
+%patch1 -p1 -b .install-info_crash
 
 %build
 %configure
@@ -143,6 +145,10 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Mon Jun  2 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.12-3
+- Fix install-info crashes on some info files
+  Resolves: #449292
+
 * Thu May 29 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.12-2
 - Fix Requires and info post script