ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix short alloc and heap corruption for winding_accu_t and brush_t - brought about by https://github.com/TTimo/bspc/pull/4

This commit is contained in:
Timothee Besset 2016-04-24 15:02:50 -05:00
parent b36b3ba4b6
commit a88ef20680
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/quake3/common/polylib.c
View File

@ -94,7 +94,7 @@ winding_accu_t *AllocWindingAccu( int points ){
c_peak_windings = c_active_windings;
}
}
s = sizeof( vec_accu_t ) * 3 * points + sizeof( int );
s = sizeof(*w) + (points > 4 ? sizeof(vec3_accu_t) * (points - 4) : 0);
w = safe_malloc( s );
memset( w, 0, s );
return w;

7
tools/quake3/q3map2/brush.c
View File

@ -93,12 +93,7 @@ brush_t *AllocBrush( int numSides ){
brush_t *bb;
size_t c;
/* allocate and clear */
if ( numSides <= 0 ) {
Error( "AllocBrush called with numsides = %d", numSides );
}
c = (size_t)&( ( (brush_t*) 0 )->sides[ numSides ] );
c = sizeof(*bb) + (numSides > 6 ? sizeof(side_t)*(numSides - 6) : 0);
bb = safe_malloc( c );
memset( bb, 0, c );
if ( numthreads == 1 ) {