m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parseiff: try to parse after the theorical end of the file

Browse Source 
some malformed IFF files are like this
This commit is contained in:
Thomas Bernard 2018-02-23 01:22:42 +01:00
parent 5907219e6f
commit 141d0bf698
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/test_iff/parseiff.c
View File

@ -81,11 +81,11 @@ static int parseiff_chunks(FILE * f, uint32_t size, int level)
char section[4]; char section[4];
uint32_t section_size; uint32_t section_size;
if (size&1) //if (size&1)
{ //{
fprintf(stderr, "WARNING: odd size of Container chunk, adjusting\n"); // fprintf(stderr, "WARNING: odd size of Container chunk, adjusting\n");
size++; // size++;
} //}
index = 0; index = 0;
while (size >= 8) while (size >= 8)
{ {
@ -115,7 +115,8 @@ static int parseiff_chunks(FILE * f, uint32_t size, int level)
else else
{ {
printf("%.4s %u\n", section, section_size); printf("%.4s %u\n", section, section_size);
section_size = (section_size+1)&~1; // round to WORD boundary if ((size & 1) == 0) // if container has EVEN size
section_size = (section_size+1)&~1; // round to WORD boundary
fseek(f, section_size, SEEK_CUR); fseek(f, section_size, SEEK_CUR);
} }
if (section_size > size) if (section_size > size)
@ -173,6 +174,17 @@ int parseiff(FILE * f)
offset = ftell(f); offset = ftell(f);
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
file_size = ftell(f); file_size = ftell(f);
fseek(f, offset, SEEK_SET);
if (file_size > offset + 8)
{
fprintf(stderr, "Tying to parse the %ld extra bytes.\n", file_size - offset);
r = parseiff_chunks(f, file_size - offset, 0);
if (r < 0)
return r;
}
offset = ftell(f);
fseek(f, 0, SEEK_END);
file_size = ftell(f);
if (offset != file_size) if (offset != file_size)
{ {
fprintf(stderr, "parsed %ld bytes, but file is %ld bytes long.\n", offset, file_size); fprintf(stderr, "parsed %ld bytes, but file is %ld bytes long.\n", offset, file_size);