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

Fix TXTH divide-by-zero with half_size and ch=0

Browse Source
This commit is contained in:
bnnm 2018-08-15 21:19:12 +02:00
parent 9c8323122c
commit a3534d7d11
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/meta/txth.c
View File

@ -315,8 +315,10 @@ VGMSTREAM * init_vgmstream_txth(STREAMFILE *streamFile) {
bytes = ffmpeg_make_riff_xma1(buf, 100, vgmstream->num_samples, txth.data_size, vgmstream->channels, vgmstream->sample_rate, xma_stream_mode); bytes = ffmpeg_make_riff_xma1(buf, 100, vgmstream->num_samples, txth.data_size, vgmstream->channels, vgmstream->sample_rate, xma_stream_mode);
} }
else if (txth.codec == XMA2) { else if (txth.codec == XMA2) {
int block_size = txth.interleave ? txth.interleave : 2048; int block_count, block_size;
int block_count = txth.data_size / block_size;
block_size = txth.interleave ? txth.interleave : 2048;
block_count = txth.data_size / block_size;
bytes = ffmpeg_make_riff_xma2(buf, 200, vgmstream->num_samples, txth.data_size, vgmstream->channels, vgmstream->sample_rate, block_count, block_size); bytes = ffmpeg_make_riff_xma2(buf, 200, vgmstream->num_samples, txth.data_size, vgmstream->channels, vgmstream->sample_rate, block_count, block_size);
} }
@ -493,6 +495,7 @@ static int parse_keyval(STREAMFILE * streamFile, STREAMFILE * streamText, txth_h
} }
else if (0==strcmp(key,"interleave")) { else if (0==strcmp(key,"interleave")) {
if (0==strcmp(val,"half_size")) { if (0==strcmp(val,"half_size")) {
if (txth->channels == 0) goto fail;
txth->interleave = txth->data_size / txth->channels; txth->interleave = txth->data_size / txth->channels;
} }
else { else {
@ -708,7 +711,7 @@ static int get_bytes_to_samples(txth_header * txth, uint32_t bytes) {
case SDX2: case SDX2:
return bytes; return bytes;
case NGC_DTK: case NGC_DTK:
return bytes / 32 * 28; /* always stereo? */ return bytes / 0x20 * 28; /* always stereo */
case APPLE_IMA4: case APPLE_IMA4:
if (!txth->interleave) return 0; if (!txth->interleave) return 0;
return (bytes / txth->interleave) * (txth->interleave - 2) * 2; return (bytes / txth->interleave) * (txth->interleave - 2) * 2;