YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-11 15:47:55 +00:00
Code Issues Projects Releases Wiki Activity

engine: imagelib: fix integer overflow on huge images when calculating reflectivity

Browse Source
This commit is contained in:
Alibek Omarov 2024-02-17 22:14:27 +03:00
parent 8b79e49a0f
commit dd2c369df3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/common/imagelib/img_bmp.c
View File

@ -28,7 +28,7 @@ qboolean Image_LoadBMP( const char *name, const byte *buffer, fs_offset_t filesi
rgba_t palette[256] = { 0 }; rgba_t palette[256] = { 0 };
int i, columns, column, rows, row, bpp = 1; int i, columns, column, rows, row, bpp = 1;
int cbPalBytes = 0, padSize = 0, bps = 0; int cbPalBytes = 0, padSize = 0, bps = 0;
int reflectivity[3] = { 0, 0, 0 }; uint reflectivity[3] = { 0, 0, 0 };
qboolean load_qfont = false; qboolean load_qfont = false;
bmp_t bhdr; bmp_t bhdr;
fs_offset_t estimatedSize; fs_offset_t estimatedSize;

2
engine/common/imagelib/img_tga.c
View File

@ -29,7 +29,7 @@ qboolean Image_LoadTGA( const char *name, const byte *buffer, fs_offset_t filesi
rgba_t palette[256]; rgba_t palette[256];
byte red = 0, green = 0, blue = 0, alpha = 0; byte red = 0, green = 0, blue = 0, alpha = 0;
int readpixelcount, pixelcount; int readpixelcount, pixelcount;
int reflectivity[3] = { 0, 0, 0 }; uint reflectivity[3] = { 0, 0, 0 };
qboolean compressed; qboolean compressed;
tga_t targa_header; tga_t targa_header;

2
engine/common/imagelib/img_wad.c
View File

@ -360,7 +360,7 @@ qboolean Image_LoadMIP( const char *name, const byte *buffer, fs_offset_t filesi
byte *fin, *pal; byte *fin, *pal;
int ofs[4], rendermode; int ofs[4], rendermode;
int i, pixels, numcolors; int i, pixels, numcolors;
int reflectivity[3] = { 0, 0, 0 }; uint reflectivity[3] = { 0, 0, 0 };
if( filesize < sizeof( mip )) if( filesize < sizeof( mip ))
return false; return false;