diff --git a/ChangeLog b/ChangeLog
index eae430e..58ca426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-31  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03719] Re: Too slow when loading big file with fold_line=1
+	* file.c (addnewline): check i <l->len
+
 2003-01-31  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 03718] Too slow when loading big file with fold_line=1
@@ -6985,4 +6990,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.731 2003/01/30 16:39:29 ukai Exp $
+$Id: ChangeLog,v 1.732 2003/01/30 16:48:40 ukai Exp $
diff --git a/file.c b/file.c
index 1dd350d..3ab0160 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.216 2003/01/30 16:39:36 ukai Exp $ */
+/* $Id: file.c,v 1.217 2003/01/30 16:48:43 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -6134,7 +6134,7 @@ addnewline(Buffer *buf, char *line, Lineprop *prop,
 	if (i == 0) {
 	    i++;
 #ifdef JP_CHARSET
-	    if (CharType(p[i]) == PC_KANJI2)
+	    if (i < l->len && CharType(p[i]) == PC_KANJI2)
 		i++;
 #endif
 	}