fix crash when using word completion

This commit is contained in:
Kamil Dudka 2018-04-25 15:36:16 +02:00
parent 8cacbefd7f
commit 6b7673569e
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,35 @@
From ce8fd571c139b6f3096c802ce919b9b3ba6ecfa0 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Mon, 23 Apr 2018 16:37:55 +0200
Subject: [PATCH] completion: correctly do a signed comparison, to avoid a
segfault
Bug existed since commit 30fc197b (a month ago) which changed the
type of 'i' from int to size_t, causing the comparison to do the
wrong thing when 'threshold' is negative.
This fixes https://savannah.gnu.org/bugs/?53722.
Reported-by: Devin Hussey <husseydevin@gmail.com>
Upstream-commit: d53086d38dcf11280ecc628a6d6b88109f1553ab
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
src/text.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/text.c b/src/text.c
index a454a9a..d625456 100644
--- a/src/text.c
+++ b/src/text.c
@@ -3640,7 +3640,7 @@ void complete_a_word(void)
/* The point where we can stop searching for shard. */
/* Traverse the whole line, looking for shard. */
- for (i = pletion_x; i < threshold; i++) {
+ for (i = pletion_x; (int)i < threshold; i++) {
/* If the first byte doesn't match, run on. */
if (pletion_line->data[i] != shard[0])
continue;
--
2.14.3

View File

@ -1,12 +1,16 @@
Summary: A small text editor Summary: A small text editor
Name: nano Name: nano
Version: 2.9.5 Version: 2.9.5
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
URL: https://www.nano-editor.org URL: https://www.nano-editor.org
Source: https://www.nano-editor.org/dist/v2.9/%{name}-%{version}.tar.gz Source: https://www.nano-editor.org/dist/v2.9/%{name}-%{version}.tar.gz
Source2: nanorc Source2: nanorc
# fix crash when using word completion
# https://savannah.gnu.org/bugs/?53722
Patch1: 0001-nano-2.9.5-word-completion-crash.patch
BuildRequires: file-devel BuildRequires: file-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: gcc BuildRequires: gcc
@ -80,6 +84,9 @@ exit 0
%{_datadir}/nano %{_datadir}/nano
%changelog %changelog
* Wed Apr 25 2018 Kamil Dudka <kdudka@redhat.com> - 2.9.5-2
- fix crash when using word completion
* Thu Mar 29 2018 Kamil Dudka <kdudka@redhat.com> - 2.9.5-1 * Thu Mar 29 2018 Kamil Dudka <kdudka@redhat.com> - 2.9.5-1
- new upstream release - new upstream release