From 94041febc53a6da10e34c2bfff9ff1d580fdce60 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 28 Sep 2012 01:38:44 +0200 Subject: [PATCH] mp3dec: Fix possibly exploitable crash I was sadly unable to find a non fuzzed mp3 that uses the feature that contained the bug (and i searched hard ...), thus while this fixes the security issue. It may or may not fix mixed blocks in 8khz mp3s, i cant say due to lack of samples to test. Security issue exists since: b37d945dd4213cb8e92146571b0374cd45d52286 Reported-by: Dale Curtis (Probably) Found-by: inferno@chromium.org Signed-off-by: Michael Niedermayer --- libavcodec/mpegaudiodec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 2393da7c04..d6de1f7b53 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -213,7 +213,7 @@ static void ff_compute_band_indexes(MPADecodeContext *s, GranuleDef *g) else g->long_end = 6; - g->short_start = 2 + (s->sample_rate_index != 8); + g->short_start = 3; } else { g->long_end = 0; g->short_start = 0;