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

Fix infinite loop with bad data in Wwise Vorbis

Browse Source
This commit is contained in:
bnnm 2020-08-22 13:40:49 +02:00
parent e42aebf945
commit ff5ffac950
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/coding/vorbis_bitreader.h
View File

@ -59,7 +59,7 @@ static int rv_bits(bitstream_t* ib, uint32_t bits, uint32_t* value) {
return 1; return 1;
fail: fail:
VGM_LOG("BITREADER: read fail\n"); VGM_LOG_ONCE("BITREADER: read fail\n");
*value = 0; *value = 0;
return 0; return 0;
} }
@ -95,7 +95,7 @@ static int wv_bits(bitstream_t* ob, uint32_t bits, uint32_t value) {
ob->b_off += bits; ob->b_off += bits;
return 1; return 1;
fail: fail:
VGM_LOG("BITREADER: write fail\n"); VGM_LOG_ONCE("BITREADER: write fail\n");
return 0; return 0;
} }
#endif #endif

3
src/coding/vorbis_custom_utils_wwise.c
View File

@ -160,6 +160,9 @@ static int read_packet(wpacket_t* wp, uint8_t* ibuf, size_t ibufsize, STREAMFILE
break; break;
} }
if (wp->header_size == 0 || wp->packet_size == 0)
goto fail;
/* read packet data */ /* read packet data */
{ {
size_t read_size = wp->packet_size; size_t read_size = wp->packet_size;