[texinfo/f14/master] Fix info crash when using index in help window
vcrhonek
vcrhonek at fedoraproject.org
Tue Aug 31 12:23:46 UTC 2010
commit 62e96126abee9b0cec33e3230e58e7f9965ee6cb
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date: Tue Aug 31 14:23:57 2010 +0200
Fix info crash when using index in help window
texinfo-4.13a-help-index-segfault.patch | 23 +++++++++++++++++++++++
texinfo.spec | 9 ++++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/texinfo-4.13a-help-index-segfault.patch b/texinfo-4.13a-help-index-segfault.patch
new file mode 100644
index 0000000..6194176
--- /dev/null
+++ b/texinfo-4.13a-help-index-segfault.patch
@@ -0,0 +1,23 @@
+diff -up texinfo-4.13/info/indices.c.orig texinfo-4.13/info/indices.c
+--- texinfo-4.13/info/indices.c.orig 2010-08-31 12:04:38.317462471 +0200
++++ texinfo-4.13/info/indices.c 2010-08-31 12:11:49.322624552 +0200
+@@ -192,6 +192,7 @@ do_info_index_search (WINDOW *window, in
+ index for, build and remember an index now. */
+ fb = file_buffer_of_window (window);
+ if (!initial_index_filename ||
++ !fb ||
+ (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
+ {
+ info_free_references (index_index);
+@@ -287,8 +288,9 @@ index_entry_exists (WINDOW *window, char
+ return 0;
+
+ fb = file_buffer_of_window (window);
+- if (!initial_index_filename
+- || (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
++ if (!initial_index_filename ||
++ !fb ||
++ (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
+ {
+ info_free_references (index_index);
+ index_index = info_indices_of_file_buffer (fb);
diff --git a/texinfo.spec b/texinfo.spec
index e1bc5a6..3b59e88 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: 9%{?dist}
+Release: 10%{?dist}
License: GPLv3+
Group: Applications/Publishing
Url: http://www.gnu.org/software/texinfo/
@@ -15,6 +15,8 @@ Patch1: texinfo-4.13a-data_types.patch
# Patch2: is already upstream
Patch2: texinfo-4.13a-mosdo-crash.patch
Patch3: texinfo-4.13a-powerpc.patch
+# Patch4: accepted by upstream, bz579263
+Patch4: texinfo-4.13a-help-index-segfault.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +62,7 @@ for printing using TeX.
%patch1 -p1 -b .data_types
%patch2 -p1 -b .mosdo-crash
%patch3 -p1 -b .powerpc
+%patch4 -p1 -b .help-index-segfault
%build
%configure
@@ -159,6 +162,10 @@ fi
%{_mandir}/man1/pdftexi2dvi.1*
%changelog
+* Tue Aug 31 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-10
+- Fix info crash when using index in help window
+ Resolves: #579263
+
* Mon Jan 11 2010 Jan Gorig <jgorig at redhat.com> - 4.13a-9
- Fix PowerPC return code bug #531349
More information about the scm-commits
mailing list