diff options
author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2015-04-18 18:31:36 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-18 19:39:48 +0200 |
commit | 96c1421627aad9e9216e0d5d50419a880bdc34ee (patch) | |
tree | ea4602d7ac59aa28bfa8853ef2730a9c7353ae2d | |
parent | 8a59dbbc68f7de2d911fe9627681049b1d5f7b8b (diff) | |
download | ffmpeg-96c1421627aad9e9216e0d5d50419a880bdc34ee.tar.gz |
alsdec: ensure channel reordering is reversible
If the same idx is used for more than one i, at least one entry in
sconf->chan_pos remains uninitialized.
This can cause segmentation faults.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ef16501aebed43e34a3721336e8bee732eca2877)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/alsdec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index cfece44285..e5397951d0 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -358,10 +358,14 @@ static av_cold int read_specific_config(ALSDecContext *ctx) ctx->cs_switch = 1; for (i = 0; i < avctx->channels; i++) { + sconf->chan_pos[i] = -1; + } + + for (i = 0; i < avctx->channels; i++) { int idx; idx = get_bits(&gb, chan_pos_bits); - if (idx >= avctx->channels) { + if (idx >= avctx->channels || sconf->chan_pos[idx] != -1) { av_log(avctx, AV_LOG_WARNING, "Invalid channel reordering.\n"); ctx->cs_switch = 0; break; |