From d7952be31131a7072842f20fc4e8ae873aa1a83c Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Mon, 30 Mar 2009 03:42:40 +0000 Subject: [PATCH] mlpdec: Simplify substream length mismatch error. Originally committed as revision 18238 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mlpdec.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 7bda703..c053138 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1017,8 +1017,10 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, if (read_block_data(m, &gb, substr) < 0) return -1; - } while ((get_bits_count(&gb) < substream_data_len[substr] * 8) - && get_bits1(&gb) == 0); + if (get_bits_count(&gb) >= substream_data_len[substr] * 8) + goto substream_length_mismatch; + + } while (!get_bits1(&gb)); skip_bits(&gb, (-get_bits_count(&gb)) & 15); if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 32) { @@ -1049,9 +1051,7 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, av_log(m->avctx, AV_LOG_ERROR, "Substream %d checksum failed.\n" , substr); } if (substream_data_len[substr] * 8 != get_bits_count(&gb)) { - av_log(m->avctx, AV_LOG_ERROR, "substream %d length mismatch\n", - substr); - return -1; + goto substream_length_mismatch; } next_substr: @@ -1065,6 +1065,10 @@ next_substr: return length; +substream_length_mismatch: + av_log(m->avctx, AV_LOG_ERROR, "substream %d length mismatch\n", substr); + return -1; + error: m->params_valid = 0; return -1; -- 2.7.4