From f5027cc600554764e2bf63c4718f2745b2686128 Mon Sep 17 00:00:00 2001
From: vcrhonek <vcrhonek@fedoraproject.org>
Date: Mon, 14 Dec 2009 16:16:26 +0000
Subject: [PATCH] Fix memory allocation bug when using old-style --section
 'Foo' arguments

---
 texinfo-4.13a-mosdo-crash.patch | 11 +++++++++++
 texinfo.spec                    |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 texinfo-4.13a-mosdo-crash.patch

diff --git a/texinfo-4.13a-mosdo-crash.patch b/texinfo-4.13a-mosdo-crash.patch
new file mode 100644
index 0000000..77e3a76
--- /dev/null
+++ b/texinfo-4.13a-mosdo-crash.patch
@@ -0,0 +1,11 @@
+--- texinfo-4.13/install-info/install-info.c.mosdo-crash	2009-09-02 20:18:44.000000000 -0400
++++ texinfo-4.13/install-info/install-info.c	2009-09-02 20:19:53.000000000 -0400
+@@ -1765,7 +1765,7 @@
+             err = argz_add (&argz, &argz_len, opt);
+           free (opt); opt = NULL;
+ 
+-          opt = xmalloc (strlen (regex) + sizeof ("--section="));
++          opt = xmalloc (strlen (title) + sizeof ("--section="));
+           if (sprintf (opt, "--section=%s", title) == -1)
+             err = 1;
+           if (!err)
diff --git a/texinfo.spec b/texinfo.spec
index da29d45..8347e00 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -12,6 +12,8 @@ Source1: info-dir
 Source2: texi2pdf.man
 Patch0: texinfo-4.12-zlib.patch
 Patch1: texinfo-4.13a-data_types.patch
+# Patch2: is already upstream
+Patch2: texinfo-4.13a-mosdo-crash.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +57,7 @@ for printing using TeX.
 %setup -q -n %{name}-4.13
 %patch0 -p1 -b .zlib
 %patch1 -p1 -b .data_types
+%patch2 -p1 -b .mosdo-crash
 
 %build
 %configure
@@ -154,6 +157,9 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Mon Dec 14 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.13a-8
+- Fix memory allocation bug when using old-style --section "Foo" arguments
+
 * Wed Sep  2 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.13a-7
 - Fix errors installing texinfo/info with --excludedocs
   Resolves: #515909