eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Multi-stream now checks that each stream at least contains a ToC.

Browse source
This commit is contained in:
Jean-Marc Valin 2011-10-31 13:18:43 -04:00
parent f8fc8f2960
commit 27592c3e49
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/opus_multistream.c
View file

@ -597,6 +597,7 @@ static int opus_multistream_decode_native(
int mono_size; int mono_size;
int s, i, c; int s, i, c;
char *ptr; char *ptr;
int do_plc=0;
VARDECL(opus_val16, buf); VARDECL(opus_val16, buf);
ALLOC_STACK; ALLOC_STACK;
@ -605,8 +606,12 @@ static int opus_multistream_decode_native(
coupled_size = opus_decoder_get_size(2); coupled_size = opus_decoder_get_size(2);
mono_size = opus_decoder_get_size(1); mono_size = opus_decoder_get_size(1);
if (len==0)
do_plc = 1;
if (len < 0) if (len < 0)
return OPUS_BAD_ARG; return OPUS_BAD_ARG;
if (!do_plc && len < 2*st->layout.nb_streams-1)
return OPUS_INVALID_PACKET;
for (s=0;s<st->layout.nb_streams;s++) for (s=0;s<st->layout.nb_streams;s++)
{ {
OpusDecoder *dec; OpusDecoder *dec;
@ -615,7 +620,7 @@ static int opus_multistream_decode_native(
dec = (OpusDecoder*)ptr; dec = (OpusDecoder*)ptr;
ptr += (s < st->layout.nb_coupled_streams) ? align(coupled_size) : align(mono_size); ptr += (s < st->layout.nb_coupled_streams) ? align(coupled_size) : align(mono_size);
if (len<0) if (!do_plc && len<=0)
{ {
RESTORE_STACK; RESTORE_STACK;
return OPUS_INVALID_PACKET; return OPUS_INVALID_PACKET;