FWGS
/
xash3d-fwgs
mirror of https://github.com/FWGS/xash3d-fwgs
2
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity

ref_soft: Fix some integer overflows

This commit is contained in:
mittorn 2019-04-01 01:55:37 +07:00
parent 714084bf5b
commit 1c49d76fb7
3 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
r_polyse.c
View File

@ -306,6 +306,17 @@ void FloorDivMod (float numer, float denom, int *quotient,
r = (int)denom - r; r = (int)denom - r;
} }
} }
if( q > INT_MAX / 2 || q < INT_MIN / 2 )
{
gEngfuncs.Con_Printf( S_ERROR"FloorDivMod: q overflow!\n" );
q = 1;
}
if( r > INT_MAX / 2 || r < INT_MIN / 2 )
{
gEngfuncs.Con_Printf( S_ERROR "FloorDivMod: r overflow!\n");
r = 1;
}
*quotient = q; *quotient = q;
*rem = r; *rem = r;

12
r_rast.c
View File

@ -332,6 +332,12 @@ void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)
v = ceilv0; v = ceilv0;
v2 = r_ceilv1 - 1; v2 = r_ceilv1 - 1;
if( v < 0 || v > MAXHEIGHT )
{
gEngfuncs.Con_Printf( S_ERROR "trailing edge overflow : %d\n", v );
return;
}
edge->surfs[0] = surface_p - surfaces; edge->surfs[0] = surface_p - surfaces;
edge->surfs[1] = 0; edge->surfs[1] = 0;
@ -344,6 +350,12 @@ void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)
v2 = ceilv0 - 1; v2 = ceilv0 - 1;
v = r_ceilv1; v = r_ceilv1;
if( v < 0 || v > MAXHEIGHT )
{
gEngfuncs.Con_Printf( S_ERROR "leading edge overflow : %d\n", v );
return;
}
edge->surfs[0] = 0; edge->surfs[0] = 0;
edge->surfs[1] = surface_p - surfaces; edge->surfs[1] = surface_p - surfaces;

36
r_triapi.c
View File

@ -225,28 +225,28 @@ TriTexCoord2f
============= =============
*/ */
void TriTexCoord2f( float u, float v ) void TriTexCoord2f( volatile float u, volatile float v )
{ {
//pglTexCoord2f( u, v ); volatile double u1 = 0, v1 = 0;
u = fmod(u, 10); u = fmodf(u, 10);
v = fmod(v, 10); v = fmodf(v, 10);
if( isnan(u) ) if( u < 1000 && u > -1000 )
u = 0; u1 = u;
if( isnan(v)) if( v < 1000 && v > -1000 )
v = 0; v1 = v;
while( u < 0 ) while( u1 < 0 )
u = u + 1; u1 = u1 + 1;
while( v < 0 ) while( v1 < 0 )
v = v + 1; v1 = v1 + 1;
while( u > 1 ) while( u1 > 1 )
u = u - 1; u1 = u1 - 1;
while( v > 1 ) while( v1 > 1 )
v = v - 1; v1 = v1 - 1;
s = r_affinetridesc.skinwidth * bound(0.01,u,0.99); s = r_affinetridesc.skinwidth * bound(0,u1,1);
t = r_affinetridesc.skinheight * bound(0.01,v,0.99); t = r_affinetridesc.skinheight * bound(0,v1,1);
} }
/* /*