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

[w3m-dev 03602] Re: w3mimgdisplay core dump

Browse Source 
* w3mimgdisplay.c (DrawImage): check load_image, imageBuf[n].pixmap
* w3mimg/fb/fb_w3mimg.c (w3mfb_show_image): check img->pixmap
* w3mimg/x11/x11_w3mimg.c (x11_show_image): check img->pixmap
From: Hiroyuki Ito <hito@crl.go.jp>
This commit is contained in:
Fumitoshi UKAI
2002-12-25 16:14:45 +00:00
parent fcc128795d
commit d31151945a
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,10 @@
2002-12-26 Hiroyuki Ito <hito@crl.go.jp>
* [w3m-dev 03602] Re: w3mimgdisplay core dump
* w3mimgdisplay.c (DrawImage): check load_image, imageBuf[n].pixmap
* w3mimg/fb/fb_w3mimg.c (w3mfb_show_image): check img->pixmap
* w3mimg/x11/x11_w3mimg.c (x11_show_image): check img->pixmap
2002-12-26 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03601] Re: meta refresh
@@ -6079,4 +6086,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.647 2002/12/25 16:06:43 ukai Exp $
$Id: ChangeLog,v 1.648 2002/12/25 16:14:45 ukai Exp $

5
w3mimg/fb/fb_w3mimg.c
View File

@@ -1,4 +1,4 @@
/* $Id: fb_w3mimg.c,v 1.6 2002/11/06 03:50:49 ukai Exp $ */
/* $Id: fb_w3mimg.c,v 1.7 2002/12/25 16:14:45 ukai Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -87,6 +87,9 @@ w3mfb_show_image(w3mimg_op * self, W3MImage * img, int sx, int sy,
if (self == NULL)
return 0;
if (img->pixmap == NULL)
return 0;
frame = (FB_IMAGE **) img->pixmap;
i = frame[0]->id;
fb_image_draw(frame[i],

6
w3mimg/x11/x11_w3mimg.c
View File

@@ -1,4 +1,4 @@
/* $Id: x11_w3mimg.c,v 1.10 2002/10/05 16:43:10 ukai Exp $ */
/* $Id: x11_w3mimg.c,v 1.11 2002/12/25 16:14:45 ukai Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -355,6 +355,10 @@ x11_show_image(w3mimg_op * self, W3MImage * img, int sx, int sy, int sw,
#endif
if (self == NULL)
return 0;
if (img->pixmap == NULL)
return 0;
xi = (struct x11_info *)self->priv;
if (xi == NULL)
return 0;

8
w3mimgdisplay.c
View File

@@ -1,4 +1,4 @@
/* $Id: w3mimgdisplay.c,v 1.10 2002/11/27 16:46:34 ukai Exp $ */
/* $Id: w3mimgdisplay.c,v 1.11 2002/12/25 16:14:45 ukai Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -263,10 +263,12 @@ DrawImage(char *buf, int redraw)
imageBuf[n].pixmap = NULL;
}
w_op->load_image(w_op, &imageBuf[n], p, w, h);
if (w_op->load_image(w_op, &imageBuf[n], p, w, h) == 0)
imageBuf[n].pixmap = NULL;
draw_image:
w_op->show_image(w_op, &imageBuf[n], sx, sy, sw, sh, x, y);
if (imageBuf[n].pixmap)
w_op->show_image(w_op, &imageBuf[n], sx, sy, sw, sh, x, y);
}
void