storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 03375] NULL check of CurrentTab

Browse Source 
* display.c (disp_message_nsec): check CurrentTab
* file.c (doExternal): check CurrentTab
* image.c (loadImage): check CurrentTab
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-11-06 03:19:30 +00:00
parent 2a4e1af29c
commit 8503b2be4e
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+8 -1
View File
@@ -1,3 +1,10 @@
2002-11-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03375] NULL check of CurrentTab
* display.c (disp_message_nsec): check CurrentTab
* file.c (doExternal): check CurrentTab
* image.c (loadImage): check CurrentTab
2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp> 2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 03374] disable_secret_security_check * [w3m-dev 03374] disable_secret_security_check
@@ -4305,4 +4312,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.477 2002/11/05 17:54:38 ukai Exp $ $Id: ChangeLog,v 1.478 2002/11/06 03:19:30 ukai Exp $
display.c
+3 -3
View File
@@ -1,4 +1,4 @@
/* $Id: display.c,v 1.27 2002/11/05 17:12:02 ukai Exp $ */ /* $Id: display.c,v 1.28 2002/11/06 03:19:30 ukai Exp $ */
#include <signal.h> #include <signal.h>
#include "fm.h" #include "fm.h"
@@ -1047,7 +1047,7 @@ disp_message_nsec(char *s, int redraw_current, int sec, int purge, int mouse)
fprintf(stderr, "%s\n", conv_to_system(s)); fprintf(stderr, "%s\n", conv_to_system(s));
return; return;
} }
if (Currentbuf != NULL) if (CurrentTab != NULL && Currentbuf != NULL)
message(s, Currentbuf->cursorX + Currentbuf->rootX, message(s, Currentbuf->cursorX + Currentbuf->rootX,
Currentbuf->cursorY + Currentbuf->rootY); Currentbuf->cursorY + Currentbuf->rootY);
else else
@@ -1062,7 +1062,7 @@ disp_message_nsec(char *s, int redraw_current, int sec, int purge, int mouse)
if (mouse && use_mouse) if (mouse && use_mouse)
mouse_inactive(); mouse_inactive();
#endif #endif
if (Currentbuf != NULL && redraw_current) if (CurrentTab != NULL && Currentbuf != NULL && redraw_current)
displayBuffer(Currentbuf, B_NORMAL); displayBuffer(Currentbuf, B_NORMAL);
} }
file.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: file.c,v 1.111 2002/11/05 17:10:05 ukai Exp $ */ /* $Id: file.c,v 1.112 2002/11/06 03:19:30 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <sys/types.h> #include <sys/types.h>
#include "myctype.h" #include "myctype.h"
@@ -7113,7 +7113,7 @@ doExternal(URLFile uf, char *path, char *type, Buffer **bufp,
fmTerm(); fmTerm();
mySystem(command->ptr, 0); mySystem(command->ptr, 0);
fmInit(); fmInit();
if (Currentbuf) if (CurrentTab && Currentbuf)
displayBuffer(Currentbuf, B_FORCE_REDRAW); displayBuffer(Currentbuf, B_FORCE_REDRAW);
} }
else { else {
image.c
+4 -4
View File
@@ -1,4 +1,4 @@
/* $Id: image.c,v 1.12 2002/11/05 17:10:05 ukai Exp $ */ /* $Id: image.c,v 1.13 2002/11/06 03:19:31 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <sys/types.h> #include <sys/types.h>
@@ -431,7 +431,7 @@ loadImage(int flag)
if (!stat(cache->file, &st)) { if (!stat(cache->file, &st)) {
cache->loaded = IMG_FLAG_LOADED; cache->loaded = IMG_FLAG_LOADED;
if (getImageSize(cache)) { if (getImageSize(cache)) {
if (flag == IMG_FLAG_NEXT && Currentbuf) if (flag == IMG_FLAG_NEXT && CurrentTab && Currentbuf)
Currentbuf->need_reshape = TRUE; Currentbuf->need_reshape = TRUE;
} }
draw = TRUE; draw = TRUE;
@@ -443,7 +443,7 @@ loadImage(int flag)
} }
if (flag == IMG_FLAG_NEXT && draw) if (flag == IMG_FLAG_NEXT && draw)
drawImage(); drawImage();
if (Currentbuf) if (CurrentTab && Currentbuf)
showImageProgress(Currentbuf); showImageProgress(Currentbuf);
} }
@@ -466,7 +466,7 @@ loadImage(int flag)
} }
image_list = NULL; image_list = NULL;
image_file = NULL; image_file = NULL;
if (Currentbuf) if (CurrentTab && Currentbuf)
displayBuffer(Currentbuf, B_NORMAL); displayBuffer(Currentbuf, B_NORMAL);
return; return;
} }