texinfo: fix crash when searching for backspace.

This commit is contained in:
Leah Neukirchen 2017-08-02 19:29:57 +02:00
parent 6a65f46fdc
commit f27cee4959
2 changed files with 50 additions and 1 deletions

View File

@ -0,0 +1,49 @@
fix crash in incremental search for \
--- info/search.c 2017/07/05 17:56:51 7906
+++ info/search.c 2017/07/05 19:16:44 7907
@@ -174,8 +174,8 @@
state->match_count = match_count;
}
-/* Search BUFFER for REGEXP. Pass back the list of matches
- in MATCH_STATE. */
+/* Search BUFFER for REGEXP. If matches are found, pass back the list of
+ matches in MATCH_STATE. */
enum search_result
regexp_search (char *regexp, int is_literal, int is_insensitive,
char *buffer, size_t buflen,
@@ -201,6 +201,7 @@
char *buf = xmalloc (size);
regerror (result, &preg, buf, size);
info_error (_("regexp error: %s"), buf);
+ free (buf);
return search_invalid;
}
@@ -215,7 +216,10 @@
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;
}
--- info/session.c 2017/07/05 17:56:51 7906
+++ info/session.c 2017/07/05 19:16:44 7907
@@ -3953,10 +3953,7 @@
}
if (result != search_success)
- {
- free_matches (&matches);
- return result;
- }
+ return result;
if (node->flags & N_Simple)
{

View File

@ -1,7 +1,7 @@
# Template file for 'texinfo'
pkgname=texinfo
version=6.4
revision=1
revision=2
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="perl ncurses-devel"