Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-18 15:54:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

VAG: Added extra checks

Browse Source
This commit is contained in:
NicknineTheEagle 2019-12-01 23:15:08 +03:00
parent 57140367d0
commit 74001e74ba
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/meta/vag.c
View File

@ -199,13 +199,15 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
interleave = 0x800; interleave = 0x800;
loop_flag = 0; loop_flag = 0;
} }
else if (read_32bitBE(0x24, streamFile) == 0x56414778) { /* VAGx" */ else if (read_32bitBE(0x24, streamFile) == 0x56414778) { /* "VAGx" */
/* Need for Speed: Hot Pursuit 2 (PS2) */ /* Need for Speed: Hot Pursuit 2 (PS2) */
start_offset = 0x30; start_offset = 0x30;
channel_count = read_32bitBE(0x2c, streamFile); channel_count = read_32bitBE(0x2c, streamFile);
channel_size = channel_size / channel_count; channel_size = channel_size / channel_count;
loop_flag = 0; loop_flag = 0;
if (file_size % 0x10 != 0) goto fail;
/* detect interleave using end markers */ /* detect interleave using end markers */
interleave = 0; interleave = 0;
@ -214,7 +216,7 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
off_t end_off = 0; off_t end_off = 0;
uint8_t flag; uint8_t flag;
while (1) { while (offset > start_offset) {
offset -= 0x10; offset -= 0x10;
flag = read_8bit(offset + 0x01, streamFile); flag = read_8bit(offset + 0x01, streamFile);
if (flag == 0x01) { if (flag == 0x01) {
@ -225,9 +227,9 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
break; break;
} }
} }
if (offset == start_offset) goto fail;
} }
if (!interleave) goto fail;
} }
} }
else { else {