git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b34c6cd
)
libopusdec: default to stereo for invalid number of channels
author
Andreas Cadhalpun
<Andreas.Cadhalpun@googlemail.com>
Mon, 14 Nov 2016 20:41:45 +0000
(21:41 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Wed, 23 Nov 2016 12:03:15 +0000
(13:03 +0100)
This fixes an out-of-bounds read if avc->channels is 0.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/libopusdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/libopusdec.c
b/libavcodec/libopusdec.c
index
c6e1573
..
75eaf9b
100644
(file)
--- a/
libavcodec/libopusdec.c
+++ b/
libavcodec/libopusdec.c
@@
-42,6
+42,12
@@
static av_cold int libopus_decode_init(AVCodecContext *avc)
int ret, channel_map = 0, gain_db = 0, nb_streams, nb_coupled;
uint8_t mapping_arr[8] = { 0, 1 }, *mapping;
+ if (avc->channels <= 0) {
+ av_log(avc, AV_LOG_WARNING,
+ "Invalid number of channels %d, defaulting to stereo\n", avc->channels);
+ avc->channels = 2;
+ }
+
avc->sample_rate = 48000;
avc->sample_fmt = avc->request_sample_fmt == AV_SAMPLE_FMT_FLT ?
AV_SAMPLE_FMT_FLT : AV_SAMPLE_FMT_S16;