[w3m-dev 04360] Re: "important" bugs from bugs.debian.org

On Mon, Aug 02, 2010 at 07:22:14PM +0900, Hiroyuki Ito wrote:
> >> #387751
> >> w3m -cols 9999 -dump almost hangs computer
> >> http://bugs.debian.org/387751
> >> 
> >> -cols  9999  -dump 

> > 
> 
> 
> 
> > 
> > 
> > # backend.c 
> > # 
> 
> 
> 
> 
> 


 DEFAULT_COLS 
-- 
Regards,
	dai

GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E

diff -urNp w3m-cvs-0803.orig/backend.c w3m-cvs-0803/backend.c
--- w3m-cvs-0803.orig/backend.c	2010-07-19 15:47:34.000000000 +0900
+++ w3m-cvs-0803/backend.c	2010-08-03 09:40:55.000000000 +0900
@@ -294,7 +294,7 @@ backend(void)
 
     w3m_dump = 0;
     if (COLS == 0)
-	COLS = 80;
+	COLS = DEFAULT_COLS;
 #ifdef USE_MOUSE
     use_mouse = FALSE;
 #endif				/* USE_MOUSE */
diff -urNp w3m-cvs-0803.orig/fm.h w3m-cvs-0803/fm.h
--- w3m-cvs-0803.orig/fm.h	2010-07-26 20:42:45.000000000 +0900
+++ w3m-cvs-0803/fm.h	2010-08-03 09:42:00.000000000 +0900
@@ -101,6 +101,9 @@ void bzero(void *, int);
 #define LINELEN	256		/* Initial line length */
 #define PAGER_MAX_LINE	10000	/* Maximum line kept as pager */
 
+#define MAXIMUM_COLS 1024
+#define DEFAULT_COLS 80
+
 #ifdef USE_IMAGE
 #define MAX_IMAGE 1000
 #define MAX_IMAGE_SIZE 2048
diff -urNp w3m-cvs-0803.orig/main.c w3m-cvs-0803/main.c
--- w3m-cvs-0803.orig/main.c	2010-07-26 09:16:53.000000000 +0900
+++ w3m-cvs-0803/main.c	2010-08-03 09:48:17.000000000 +0900
@@ -634,6 +634,9 @@ main(int argc, char **argv, char **envp)
 		if (++i >= argc)
 		    usage();
 		COLS = atoi(argv[i]);
+		if (COLS > MAXIMUM_COLS) {
+		    COLS = MAXIMUM_COLS;
+		}
 	    }
 	    else if (!strcmp("-ppc", argv[i])) {
 		double ppc;
@@ -799,7 +802,7 @@ main(int argc, char **argv, char **envp)
     }
     if (w3m_dump) {
 	if (COLS == 0)
-	    COLS = 80;
+	    COLS = DEFAULT_COLS;
     }
 
 #ifdef USE_BINMODE_STREAM