nano

commit a0449d92a08d76c5aa4492cd5ed1c6d8b42c252b
parent 7641708cb65cc66a1357f2ef359e8552be908be3
Author: Chris Allegretta <chrisa@asty.org>
Date:   Wed, 12 Feb 2003 23:58:01 +0000

- files.c: load_history() - Fix segfault on loading huge strings from history file (David Benbennick)


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1455 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
3
+++
M
files.c
 | 
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -23,6 +23,9 @@ CVS code
   intput_tab()
 	- Fix assumption that matches is null terminated (David 
 	  Benbennick).
+  load_history()
+	- Fix segfault on loading huge strings from history file 
+	  (David Benbennick).
 - nano.c:
   breakable()
 	- Fix incorrect return value on short lines (David Benbennick).
diff --git a/files.c b/files.c
@@ -2896,7 +2896,7 @@ void load_history(void)
 	    buf = charalloc(1024);
 	    while (fgets(buf, 1023, hist) != 0) {
 		ptr = buf;
-		while (*ptr != '\n')
+		while (*ptr != '\n' && *ptr != '\0' && ptr < buf + 1023)
 		    ptr++;
 		*ptr = '\0';
 		if (strlen(buf))