From: Chris Allegretta Date: Sat, 7 Feb 2009 00:01:40 +0000 (+0000) Subject: 2009-02-06 Chris Allegretta X-Git-Tag: v2.1.8~4 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4522ca2d1b10f7b6190f9acd166abeebe08917bd;p=nano.git 2009-02-06 Chris Allegretta * rcfile.c (parse_include): Abort on being unable to open an included rcfile. Fixes Savannah bug 25490, nanorc: "include"ing a file which doesn't exist causes nano to segfault. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4365 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 7918e737..b0e9ca19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-02-06 Chris Allegretta + * rcfile.c (parse_include): Abort on being unable to open an included rcfile. Fixes + Savannah bug 25490, nanorc: "include"ing a file which doesn't exist causes nano to segfault. + 2009-02-05 Chris Allegretta * More color syntax speedups: Determine in reset_multis() whether we really need to call edit_refresh(). Additional global var edit_refresh_needed() to hopefully reduce diff --git a/src/rcfile.c b/src/rcfile.c index 5bbaa0f3..d0d985c1 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -495,6 +495,7 @@ void parse_include(char *ptr) if ((rcstream = fopen(option, "rb")) == NULL) { rcfile_error(_("Error reading %s: %s"), option, strerror(errno)); + return; } /* Use the name and line number position of the new syntax file