aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--main.c5
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 64976c8..125d3d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-12 qhwt@myrealbox.com
+
+ * [w3m-dev 03636] segfault in main.c
+ * main.c (main): check newbuf->currentURL.file
+
2003-01-12 Fumitoshi UKAI <ukai@debian.or.jp>
* Bonus/README.eng: sync with Bonus/README
@@ -6398,4 +6403,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.678 2003/01/11 16:14:59 ukai Exp $
+$Id: ChangeLog,v 1.679 2003/01/11 16:17:43 ukai Exp $
diff --git a/main.c b/main.c
index 60cb0a6..4ab92db 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.190 2003/01/11 15:54:09 ukai Exp $ */
+/* $Id: main.c,v 1.191 2003/01/11 16:17:43 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -888,7 +888,8 @@ main(int argc, char **argv, char **envp)
}
else if (newbuf == NO_BUFFER)
continue;
- if (newbuf->pagerSource || strcmp(newbuf->currentURL.file, "-"))
+ if (newbuf->pagerSource ||
+ (newbuf->currentURL.file && strcmp(newbuf->currentURL.file, "-")))
newbuf->search_header = search_header;
if (CurrentTab == NULL) {
FirstTab = LastTab = CurrentTab = newTab();