quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use offsetof( type, flexible_array_member[size] ) semantics

Browse Source
This commit is contained in:
Garux 2020-01-13 00:37:44 +03:00
parent 99bae99b36
commit a626907ba9
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,17 +449,10 @@ winding_t *BaseWindingForPlane( vec3_t normal, vec_t dist ){
================== ==================
*/ */
winding_t *CopyWinding( winding_t *w ){ winding_t *CopyWinding( winding_t *w ){
size_t size;
winding_t *c;
if ( !w ) { if ( !w ) {
Error( "CopyWinding: winding is NULL" ); Error( "CopyWinding: winding is NULL" );
} }
return memcpy( AllocWinding( w->numpoints ), w, offsetof( winding_t, p[w->numpoints] ) );
c = AllocWinding( w->numpoints );
size = offsetof( winding_t, p ) + sizeof( *w->p ) * w->numpoints;
memcpy( c, w, size );
return c;
} }
/* /*

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

@ -157,21 +157,15 @@ void FreeBrushList( brush_t *brushes ){
*/ */
brush_t *CopyBrush( brush_t *brush ){ brush_t *CopyBrush( brush_t *brush ){
brush_t *newBrush;
size_t size;
int i;
/* copy brush */ /* copy brush */
size = offsetof( brush_t, sides ) + sizeof( *brush->sides ) * brush->numsides; brush_t *newBrush = AllocBrush( brush->numsides );
newBrush = AllocBrush( brush->numsides ); memcpy( newBrush, brush, offsetof( brush_t, sides[brush->numsides] ) );
memcpy( newBrush, brush, size );
/* ydnar: nuke linked list */ /* ydnar: nuke linked list */
newBrush->next = NULL; newBrush->next = NULL;
/* copy sides */ /* copy sides */
for ( i = 0; i < brush->numsides; i++ ) for ( int i = 0; i < brush->numsides; i++ )
{ {
if ( brush->sides[ i ].winding != NULL ) { if ( brush->sides[ i ].winding != NULL ) {
newBrush->sides[ i ].winding = CopyWinding( brush->sides[ i ].winding ); newBrush->sides[ i ].winding = CopyWinding( brush->sides[ i ].winding );

2
tools/quake3/q3map2/visflow.c
View File

@ -1421,7 +1421,7 @@ void CreatePassages( int portalnum ){
/* ydnar: prefer correctness to stack overflow */ /* ydnar: prefer correctness to stack overflow */
//% memcpy( &in, p->winding, (int)((fixedWinding_t *)0)->points[p->winding->numpoints] ); //% memcpy( &in, p->winding, (int)((fixedWinding_t *)0)->points[p->winding->numpoints] );
if ( p->winding->numpoints <= MAX_POINTS_ON_FIXED_WINDING ) { if ( p->winding->numpoints <= MAX_POINTS_ON_FIXED_WINDING ) {
memcpy( &in, p->winding, offsetof( fixedWinding_t, points ) + sizeof( *p->winding->points ) * p->winding->numpoints ); memcpy( &in, p->winding, offsetof( fixedWinding_t, points[p->winding->numpoints] ) );
} }
else{ else{
memcpy( &in, p->winding, sizeof( fixedWinding_t ) ); memcpy( &in, p->winding, sizeof( fixedWinding_t ) );