# HG changeset patch # User jbr # Date 1237756390 0 # Node ID 7ec90057127a84341e2392422a7ddaca555f1d4d # Parent df759d70d6f9712ef5505bff72589315e16aa0a0 10l: don't check against current layout until after validating ch_mode. should have been in last commit. diff -r df759d70d6f9 -r 7ec90057127a flacdec.c --- a/flacdec.c Sun Mar 22 21:07:43 2009 +0000 +++ b/flacdec.c Sun Mar 22 21:13:10 2009 +0000 @@ -495,7 +495,7 @@ /* channels and decorrelation */ ch_mode = get_bits(gb, 4); - if (ch_mode < FLAC_MAX_CHANNELS && s->channels == ch_mode+1) { + if (ch_mode < FLAC_MAX_CHANNELS) { channels = ch_mode + 1; ch_mode = FLAC_CHMODE_INDEPENDENT; } else if (ch_mode <= FLAC_CHMODE_MID_SIDE) {