Browse Source

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>
tags/n2.7
Andreas Cadhalpun Michael Niedermayer 10 years ago
parent
commit
ef16501aeb
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      libavcodec/alsdec.c

+ 5
- 1
libavcodec/alsdec.c View File

@@ -357,11 +357,15 @@ 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;


Loading…
Cancel
Save