From: divverent Date: Wed, 30 Dec 2009 07:40:48 +0000 (+0000) Subject: fix the overflow checks :( X-Git-Tag: xonotic-v0.1.0preview~911 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=840e5386a67c533cf30a09f6f6751debb8405d71 fix the overflow checks :( git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9737 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/gl_textures.c b/gl_textures.c index 25107d6f..ea76ea63 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -1225,7 +1225,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen bytesperblock = 0; bytesperpixel = 4; size = dds_width*dds_height*bytesperpixel; - if(128 + size < ddsfilesize) + if(128 + size > ddsfilesize) { Mem_Free(dds); Con_Printf("^1%s: invalid BGRA DDS image\n"); @@ -1247,7 +1247,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen bytesperblock = 8; bytesperpixel = 0; size = ((dds_width+3)/4)*((dds_height+3)/4)*bytesperblock; - if(128 + size < ddsfilesize) + if(128 + size > ddsfilesize) { Mem_Free(dds); Con_Printf("^1%s: invalid DXT1 DDS image\n"); @@ -1268,7 +1268,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen bytesperblock = 16; bytesperpixel = 0; size = ((dds_width+3)/4)*((dds_height+3)/4)*bytesperblock; - if(128 + size < ddsfilesize) + if(128 + size > ddsfilesize) { Mem_Free(dds); Con_Printf("^1%s: invalid DXT3 DDS image\n"); @@ -1282,7 +1282,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen bytesperblock = 16; bytesperpixel = 0; size = ((dds_width+3)/4)*((dds_height+3)/4)*bytesperblock; - if(128 + size < ddsfilesize) + if(128 + size > ddsfilesize) { Mem_Free(dds); Con_Printf("^1%s: invalid DXT5 DDS image\n");