qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 07:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some errors found by valgrind

Browse source
This commit is contained in:
Bill Currie 2010-08-23 09:50:42 +09:00
parent db898655d1
commit 7fca21837a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/bsp2img/bsp2img.c
View file

@ -149,8 +149,9 @@ plotpoint (image_t *image, long xco, long yco, unsigned int color)
{ {
unsigned int bigcol = 0; unsigned int bigcol = 0;
if (image->width < 0 || image->height < 0 if (image->width <= 0 || image->height <= 0
|| xco < 0 || xco > image->width || yco < 0 || yco > image->height) || xco < 0 || xco >= image->width
|| yco < 0 || yco >= image->height)
return; return;
bigcol = (unsigned int) image->image[yco * image->width + xco]; bigcol = (unsigned int) image->image[yco * image->width + xco];
@ -729,10 +730,10 @@ render_map (bsp_t *bsp)
{ {
long width, height; long width, height;
width = (maxX - minX) / options.scaledown; width = (maxX - minX + 1) / options.scaledown;
width += (options.image_pad + options.z_pad) * 2; width += (options.image_pad + options.z_pad) * 2;
height = (maxY - minY) / options.scaledown; height = (maxY - minY + 1) / options.scaledown;
height += (options.image_pad + options.z_pad) * 2; height += (options.image_pad + options.z_pad) * 2;
image = create_image (width, height); image = create_image (width, height);
@ -964,6 +965,7 @@ main (int argc, char *argv[])
Qclose (bspfile); Qclose (bspfile);
image = render_map (bsp); image = render_map (bsp);
BSP_Free (bsp);
/* Write image */ /* Write image */