From 8de43fc9bfb79084fa8420ef93b0a734a7730f06 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Tue, 28 May 2019 14:14:25 +0200 Subject: [PATCH] fix possible crash while opening help Suggested by Benno Schulenberg (upstream maintainer) at: http://lists.gnu.org/archive/html/nano-devel/2019-05/msg00027.html --- 0005-nano-4.2-help-crash.patch | 30 ++++++++++++++++++++++++++++++ nano.spec | 8 +++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0005-nano-4.2-help-crash.patch diff --git a/0005-nano-4.2-help-crash.patch b/0005-nano-4.2-help-crash.patch new file mode 100644 index 0000000..0b55415 --- /dev/null +++ b/0005-nano-4.2-help-crash.patch @@ -0,0 +1,30 @@ +From 00351963c03818d058bfc355663fe0d7c86b9386 Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Thu, 23 May 2019 12:43:31 +0200 +Subject: [PATCH] help: don't check for confinement when opening a temporary + help-text file + +This fixes https://savannah.gnu.org/bugs/?56369. + +Upstream-commit: acd23551c3322f397dc43f97796273a8958f6ef9 +Signed-off-by: Kamil Dudka +--- + src/files.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/files.c b/src/files.c +index 20bbd942..7952bc00 100644 +--- a/src/files.c ++++ b/src/files.c +@@ -420,7 +420,7 @@ bool open_buffer(const char *filename, bool new_buffer) + as_an_at = FALSE; + + #ifdef ENABLE_OPERATINGDIR +- if (outside_of_confinement(filename, FALSE)) { ++ if (!inhelp && outside_of_confinement(filename, FALSE)) { + statusline(ALERT, _("Can't read file from outside of %s"), + operating_dir); + return FALSE; +-- +2.20.1 + diff --git a/nano.spec b/nano.spec index c664ae9..9911c51 100644 --- a/nano.spec +++ b/nano.spec @@ -1,7 +1,7 @@ Summary: A small text editor Name: nano Version: 4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://www.nano-editor.org Source: https://www.nano-editor.org/dist/latest/%{name}-%{version}.tar.xz @@ -17,6 +17,9 @@ BuildRequires: sed BuildRequires: texinfo Conflicts: filesystem < 3 +# fix possible crash while opening help +Patch5: 0005-nano-4.2-help-crash.patch + %description GNU nano is a small and friendly text editor. @@ -64,6 +67,9 @@ install -m 0644 ./nanorc %{buildroot}%{_sysconfdir}/nanorc %{_datadir}/nano %changelog +* Tue May 28 2019 Kamil Dudka - 4.2-2 +- fix possible crash while opening help + * Wed Apr 24 2019 Kamil Dudka - 4.2-1 - new upstream release