Compare commits
1 Commits
Author | SHA1 | Date |
---|---|---|
Vitezslav Crhonek | cb1bb138ab |
|
@ -0,0 +1,37 @@
|
||||||
|
diff -up texinfo-6.4/info/search.c.orig texinfo-6.4/info/search.c
|
||||||
|
--- texinfo-6.4/info/search.c.orig 2017-04-17 09:39:56.000000000 +0200
|
||||||
|
+++ texinfo-6.4/info/search.c 2017-12-04 11:31:09.180059724 +0100
|
||||||
|
@@ -201,6 +201,7 @@ regexp_search (char *regexp, int is_lite
|
||||||
|
char *buf = xmalloc (size);
|
||||||
|
regerror (result, &preg, buf, size);
|
||||||
|
info_error (_("regexp error: %s"), buf);
|
||||||
|
+ free (buf);
|
||||||
|
return search_invalid;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -215,7 +216,10 @@ regexp_search (char *regexp, int is_lite
|
||||||
|
extend_matches (match_state);
|
||||||
|
|
||||||
|
if (match_state->match_count == 0)
|
||||||
|
- return search_not_found;
|
||||||
|
+ {
|
||||||
|
+ free_matches (match_state);
|
||||||
|
+ return search_not_found;
|
||||||
|
+ }
|
||||||
|
else
|
||||||
|
return search_success;
|
||||||
|
}
|
||||||
|
diff -up texinfo-6.4/info/session.c.orig texinfo-6.4/info/session.c
|
||||||
|
--- texinfo-6.4/info/session.c.orig 2017-12-04 11:31:15.023062714 +0100
|
||||||
|
+++ texinfo-6.4/info/session.c 2017-12-04 11:31:41.870076452 +0100
|
||||||
|
@@ -3953,10 +3953,7 @@ info_search_in_node_internal (WINDOW *wi
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result != search_success)
|
||||||
|
- {
|
||||||
|
- free_matches (&matches);
|
||||||
|
return result;
|
||||||
|
- }
|
||||||
|
|
||||||
|
if (node->flags & N_Simple)
|
||||||
|
{
|
10
texinfo.spec
10
texinfo.spec
|
@ -3,7 +3,7 @@
|
||||||
Summary: Tools needed to create Texinfo format documentation files
|
Summary: Tools needed to create Texinfo format documentation files
|
||||||
Name: texinfo
|
Name: texinfo
|
||||||
Version: 6.4
|
Version: 6.4
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Group: Applications/Publishing
|
Group: Applications/Publishing
|
||||||
Url: http://www.gnu.org/software/texinfo/
|
Url: http://www.gnu.org/software/texinfo/
|
||||||
|
@ -17,9 +17,10 @@ Patch0: texinfo-4.12-zlib.patch
|
||||||
Patch1: texinfo-6.0-disable-failing-info-test.patch
|
Patch1: texinfo-6.0-disable-failing-info-test.patch
|
||||||
# Patch2: rhbz#1348671, because of OSTree
|
# Patch2: rhbz#1348671, because of OSTree
|
||||||
Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
|
Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
|
||||||
# Patches 3-4 are already upstream
|
# Patches 3-5 are already upstream
|
||||||
Patch3: texinfo-6.4-info-fix-following-more-than-one-line-cross-reference.patch
|
Patch3: texinfo-6.4-info-fix-following-more-than-one-line-cross-reference.patch
|
||||||
Patch4: texinfo-6.4-info-fix-possible-incorrect-selection-of-already-loaded-file.patch
|
Patch4: texinfo-6.4-info-fix-possible-incorrect-selection-of-already-loaded-file.patch
|
||||||
|
Patch5: texinfo-6.4-info-fix-search.patch
|
||||||
Requires(post): /sbin/install-info
|
Requires(post): /sbin/install-info
|
||||||
Requires(preun): /sbin/install-info
|
Requires(preun): /sbin/install-info
|
||||||
Requires: perl-interpreter >= 5.7.3, perl(Text::Unidecode)
|
Requires: perl-interpreter >= 5.7.3, perl(Text::Unidecode)
|
||||||
|
@ -74,6 +75,7 @@ for printing using TeX.
|
||||||
%patch2 -p1 -b .install-info-use-create-tmp-then-rename-pattern
|
%patch2 -p1 -b .install-info-use-create-tmp-then-rename-pattern
|
||||||
%patch3 -p1 -b .info-fix-following-more-than-one-line-cross-reference
|
%patch3 -p1 -b .info-fix-following-more-than-one-line-cross-reference
|
||||||
%patch4 -p1 -b .info-fix-possible-incorrect-selection-of-already-loaded-file
|
%patch4 -p1 -b .info-fix-possible-incorrect-selection-of-already-loaded-file
|
||||||
|
%patch5 -p1 -b .info-fix-search
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --with-external-Text-Unidecode \
|
%configure --with-external-Text-Unidecode \
|
||||||
|
@ -176,6 +178,10 @@ fi
|
||||||
%{_mandir}/man1/pdftexi2dvi.1*
|
%{_mandir}/man1/pdftexi2dvi.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 04 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4-6
|
||||||
|
- Fix crash in search
|
||||||
|
Resolves: #1516326
|
||||||
|
|
||||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.4-5
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.4-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue