nano

commit 4522ca2d1b10f7b6190f9acd166abeebe08917bd
parent fd265af15a4e4b87df8e02180e50832b1aeb95d4
Author: Chris Allegretta <chrisa@asty.org>
Date:   Sat,  7 Feb 2009 00:01:40 +0000

2009-02-06 Chris Allegretta <chrisa@asty.org>
        * 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

Diffstat:
M
ChangeLog
 | 
4
++++
M
src/rcfile.c
 | 
1
+

2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-06 Chris Allegretta <chrisa@asty.org>
+	* 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 <chrisa@asty.org>
 	* 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
@@ -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