Fix info crash when using index in help window
This commit is contained in:
parent
eaabb65aef
commit
a76aa943cf
23
texinfo-4.13a-help-index-segfault.patch
Normal file
23
texinfo-4.13a-help-index-segfault.patch
Normal file
@ -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);
|
@ -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@redhat.com> - 4.13a-10
|
||||
- Fix info crash when using index in help window
|
||||
Resolves: #579263
|
||||
|
||||
* Mon Jan 11 2010 Jan Gorig <jgorig@redhat.com> - 4.13a-9
|
||||
- Fix PowerPC return code bug #531349
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user