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

[w3m-dev 03436] Check image size

Browse Source 
* file.c (process_img): check w > MAX_IMAGE_SIZE
	(HTMLlineproc2body): check w,h > MAX_IMAGE_SIZE
* fm.h (MAX_IMAGE_SIZE): added
* image.c (getImageSize): check w,h,width,height > MAX_IMAGE_SIZE
From: Hiroyuki Ito <hito@crl.go.jp>
This commit is contained in:
Fumitoshi UKAI
2002-11-15 15:56:36 +00:00
parent 073f8a9105
commit 6a9b87edf9
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
image.c
View File

@@ -1,4 +1,4 @@
/* $Id: image.c,v 1.17 2002/11/15 15:51:24 ukai Exp $ */
/* $Id: image.c,v 1.18 2002/11/15 15:56:36 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
@@ -630,14 +630,16 @@ getImageSize(ImageCache * cache)
if (h == 0)
h = 1;
if (cache->width < 0 && cache->height < 0) {
cache->width = w;
cache->height = h;
cache->width = (w > MAX_IMAGE_SIZE) ? MAX_IMAGE_SIZE: w;
cache->height = (h > MAX_IMAGE_SIZE) ? MAX_IMAGE_SIZE: h;
}
else if (cache->width < 0) {
cache->width = (int)((double)cache->height * w / h + 0.5);
int tmp = (int)((double)cache->height * w / h + 0.5);
cache->width = (tmp > MAX_IMAGE_SIZE) ? MAX_IMAGE_SIZE: tmp;
}
else if (cache->height < 0) {
cache->height = (int)((double)cache->width * h / w + 0.5);
int tmp = (int)((double)cache->width * h / w + 0.5);
cache->height = (tmp > MAX_IMAGE_SIZE) ? MAX_IMAGE_SIZE: tmp;
}
if (cache->width == 0)
cache->width = 1;