Skip to content

Commit 061c989

Browse files
committed
Read chunk id and size separately
1 parent 2b75f14 commit 061c989

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/sfloader/fluid_sffile.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,11 @@ static const unsigned short invalid_preset_gen[] =
158158
#define READCHUNK(sf, var) \
159159
do \
160160
{ \
161-
if (sf->fcbs->fread(var, 8, sf->sffd) == FLUID_FAILED) \
161+
if (sf->fcbs->fread(&(var)->id, 4, sf->sffd) == FLUID_FAILED) \
162162
return FALSE; \
163-
((SFChunk *)(var))->size = FLUID_LE32TOH(((SFChunk *)(var))->size); \
163+
if (sf->fcbs->fread(&(var)->size, 4, sf->sffd) == FLUID_FAILED) \
164+
return FALSE; \
165+
(var)->size = FLUID_LE32TOH((var)->size); \
164166
} while (0)
165167

166168
#define READD(sf, var) \

0 commit comments

Comments
 (0)