AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 11:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix various UB issues (#2159)

Browse Source 
* Fix "applying non-zero offset to NULL pointer".

* Fix "non-aligned access to struct members" (maptexture_t).
This commit is contained in:
Roman Fomin 2025-01-27 09:53:23 +07:00 committed by GitHub
parent bdd5630f8d
commit 4ebaddec41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/m_array.h
View File

@ -98,7 +98,7 @@ inline static void array_clear(const void *v)
} \ } \
} while (0) } while (0)
#define array_end(v) ((v) + array_size(v)) #define array_end(v) ((v) ? (v) + array_ptr(v)->size : (v))
#define array_foreach(ptr, v) \ #define array_foreach(ptr, v) \
for (ptr = (v); ptr < array_end(v); ++ptr) for (ptr = (v); ptr < array_end(v); ++ptr)

3
src/m_fixed.h
View File

@ -58,10 +58,9 @@
#define FRACUNIT (1<<FRACBITS) #define FRACUNIT (1<<FRACBITS)
#define FIXED2DOUBLE(x) ((x)/(double)FRACUNIT) #define FIXED2DOUBLE(x) ((x)/(double)FRACUNIT)
#define FRACMASK (FRACUNIT - 1) #define FRACMASK (FRACUNIT - 1)
#define FRACFILL(x, o) ((x) | ((o) < 0 ? (FRACMASK << (32 - FRACBITS)) : 0))
#define IntToFixed(x) ((x) << FRACBITS) #define IntToFixed(x) ((x) << FRACBITS)
#define FixedToInt(x) FRACFILL((x) >> FRACBITS, (x)) #define FixedToInt(x) ((x) >> FRACBITS)
typedef int fixed_t; typedef int fixed_t;

2
src/p_spec.c
View File

@ -151,7 +151,7 @@ void P_InitPicAnims (void)
for (i=0 ; animdefs[i].istexture != -1 ; i++) for (i=0 ; animdefs[i].istexture != -1 ; i++)
{ {
// 1/11/98 killough -- removed limit by array-doubling // 1/11/98 killough -- removed limit by array-doubling
if (lastanim >= anims + maxanims) if (!anims || lastanim >= anims + maxanims)
{ {
size_t newmax = maxanims ? maxanims*2 : MAXANIMS; size_t newmax = maxanims ? maxanims*2 : MAXANIMS;
anims = Z_Realloc(anims, newmax*sizeof(*anims), PU_STATIC, 0); // killough anims = Z_Realloc(anims, newmax*sizeof(*anims), PU_STATIC, 0); // killough

15
src/r_data.c
View File

@ -66,14 +66,18 @@
// and possibly other attributes. // and possibly other attributes.
// //
typedef struct #if defined(_MSC_VER)
#pragma pack(push, 1)
#endif
typedef PACKED_PREFIX struct
{ {
short originx; short originx;
short originy; short originy;
short patch; short patch;
short stepdir; // unused in Doom but might be used in Phase 2 Boom short stepdir; // unused in Doom but might be used in Phase 2 Boom
short colormap; // unused in Doom but might be used in Phase 2 Boom short colormap; // unused in Doom but might be used in Phase 2 Boom
} mappatch_t; } PACKED_SUFFIX mappatch_t;
// //
@ -81,7 +85,7 @@ typedef struct
// A DOOM wall texture is a list of patches // A DOOM wall texture is a list of patches
// which are to be combined in a predefined order. // which are to be combined in a predefined order.
// //
typedef struct typedef PACKED_PREFIX struct
{ {
char name[8]; char name[8];
int masked; int masked;
@ -90,8 +94,11 @@ typedef struct
char pad[4]; // unused in Doom but might be used in Boom Phase 2 char pad[4]; // unused in Doom but might be used in Boom Phase 2
short patchcount; short patchcount;
mappatch_t patches[1]; mappatch_t patches[1];
} maptexture_t; } PACKED_SUFFIX maptexture_t;
#if defined(_MSC_VER)
#pragma pack(pop)
#endif
// A single patch from a texture definition, basically // A single patch from a texture definition, basically
// a rectangular area within the texture rectangle. // a rectangular area within the texture rectangle.

4
src/z_zone.c
View File

@ -96,11 +96,13 @@ void *Z_Malloc(size_t size, pu_tag tag, void **user)
void Z_Free(void *p) void Z_Free(void *p)
{ {
memblock_t *block = (memblock_t *)((char *) p - HEADER_SIZE); memblock_t *block;
if (!p) if (!p)
return; return;
block = (memblock_t *)((char *) p - HEADER_SIZE);
if (block->id != ZONEID) if (block->id != ZONEID)
I_Error("Z_Free: freed a pointer without ZONEID"); I_Error("Z_Free: freed a pointer without ZONEID");
block->id = 0; // Nullify id so another free fails block->id = 0; // Nullify id so another free fails