Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.xiph.org/xiph/opus.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Marc Valin <jmvalin@jmvalin.ca>2018-03-23 23:13:59 +0300
committerJean-Marc Valin <jmvalin@jmvalin.ca>2018-03-27 22:13:27 +0300
commit69bcb28d3ddb20231580bd09e44d87a769dabcb7 (patch)
tree2f77881efd1abd40ede3db650fd20a5bef6b1df3 /src
parent3995a0c150511572280170280a348fab575edbe7 (diff)
Some missing checks
Diffstat (limited to 'src')
-rw-r--r--src/opus_decoder.c2
-rw-r--r--src/opus_multistream_decoder.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index 483d918e..9113638a 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -769,6 +769,7 @@ int opus_decode_float(OpusDecoder *st, const unsigned char *data,
else
return OPUS_INVALID_PACKET;
}
+ celt_assert(st->channels == 1 || st->channels == 2);
ALLOC(out, frame_size*st->channels, opus_int16);
ret = opus_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 0);
@@ -806,6 +807,7 @@ int opus_decode(OpusDecoder *st, const unsigned char *data,
else
return OPUS_INVALID_PACKET;
}
+ celt_assert(st->channels == 1 || st->channels == 2);
ALLOC(out, frame_size*st->channels, float);
ret = opus_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 1);
diff --git a/src/opus_multistream_decoder.c b/src/opus_multistream_decoder.c
index 39699fd0..f767ea0d 100644
--- a/src/opus_multistream_decoder.c
+++ b/src/opus_multistream_decoder.c
@@ -202,7 +202,7 @@ int opus_multistream_decode_native(
VALIDATE_MS_DECODER(st);
/* Limit frame_size to avoid excessive stack allocations. */
- opus_multistream_decoder_ctl(st, OPUS_GET_SAMPLE_RATE(&Fs));
+ MUST_SUCCEED(opus_multistream_decoder_ctl(st, OPUS_GET_SAMPLE_RATE(&Fs)));
frame_size = IMIN(frame_size, Fs/25*3);
ALLOC(buf, 2*frame_size, opus_val16);
ptr = (char*)st + align(sizeof(OpusMSDecoder));