aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2013-08-04 02:38:35 +0000
committerTatsuya Kinoshita <tats@debian.org>2013-08-04 02:38:35 +0000
commit1515daab163bf302935a42aada99e518e082d95a (patch)
tree26201823d36c953de053f408c91bf0ea4b46cde8
parentMerge branch 'feature/debian-version' (diff)
parentFix segfault of loadGeneralFile() (diff)
downloadw3m-1515daab163bf302935a42aada99e518e082d95a.tar.gz
w3m-1515daab163bf302935a42aada99e518e082d95a.zip
Merge branch 'feature/siteconf'
-rw-r--r--file.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/file.c b/file.c
index 3564746..89c9152 100644
--- a/file.c
+++ b/file.c
@@ -2267,10 +2267,11 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (header_string)
header_string = NULL;
#ifdef USE_NNTP
- if (f.scheme == SCM_NNTP || f.scheme == SCM_NEWS)
+ if (b && b != NO_BUFFER && (f.scheme == SCM_NNTP || f.scheme == SCM_NEWS))
reAnchorNewsheader(b);
#endif
- preFormUpdateBuffer(b);
+ if (b && b != NO_BUFFER)
+ preFormUpdateBuffer(b);
TRAP_OFF;
return b;
}