RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: use memcpy when reading sprite model to avoid unaligned access

Browse Source
This commit is contained in:
Alibek Omarov
2026-05-17 12:34:21 +05:00
parent 463ed05340
commit 334bebb1fb
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
engine/common/mod_sprite.c
View File

@@ -58,9 +58,7 @@ static byte *Mod_SwapSpriteFrame( byte *p, byte *end, int bytes )
memcpy( &frame, p, sizeof( frame ));
le_struct_swap( dspriteframe_swap, &frame );
#if XASH_BIG_ENDIAN
memcpy( p, &frame, sizeof( frame ));
#endif
p += sizeof( frame );
// skip pixel data
@@ -73,26 +71,30 @@ static byte *Mod_SwapSpriteFrame( byte *p, byte *end, int bytes )
static byte *Mod_SwapSpriteGroup( byte *p, byte *end, int bytes )
{
dspritegroup_t *group;
dspritegroup_t group;
if( p + sizeof( *group ) > end )
if( p + sizeof( group ) > end )
return NULL;
group = (dspritegroup_t *)p;
group->numframes = LittleLong( group->numframes );
p += sizeof( *group );
memcpy( &group, p, sizeof( group ));
group.numframes = LittleLong( group.numframes );
memcpy( p, &group, sizeof( group ));
p += sizeof( group );
// swap intervals
int numframes = group->numframes;
int numframes = group.numframes;
if( p + numframes * sizeof( dspriteinterval_t ) > end )
return NULL;
for( int i = 0; i < numframes; i++ )
{
dspriteinterval_t *interval = (dspriteinterval_t *)p;
interval->interval = LittleFloat( interval->interval );
p += sizeof( *interval );
dspriteinterval_t interval;
memcpy( &interval, p, sizeof( interval ));
interval.interval = LittleFloat( interval.interval );
memcpy( p, &interval, sizeof( interval ));
p += sizeof( interval );
}
// swap each frame in the group
@@ -155,16 +157,17 @@ static qboolean Mod_SwapSprite( void *buffer, size_t buffersize, int *out_versio
// swap all frames
for( int i = 0; i < numframes && p && p < end; i++ )
{
dframetype_t *frametype;
dframetype_t frametype;
if( p + sizeof( *frametype ) > end )
if( p + sizeof( frametype ) > end )
return false;
frametype = (dframetype_t *)p;
frametype->type = LittleLong( frametype->type );
p += sizeof( *frametype );
memcpy( &frametype, p, sizeof( frametype ));
frametype.type = LittleLong( frametype.type );
memcpy( p, &frametype, sizeof( frametype ));
p += sizeof( frametype );
switch( frametype->type )
switch( frametype.type )
{
case FRAME_SINGLE:
p = Mod_SwapSpriteFrame( p, end, bytes );