| Message ID | 20191205230718.22830-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | e7011a0ca6548e12b458259c51e305e8a4d5ae2e |
| Headers | show |
LGTM On 12/6/19, Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: Infinite loop > Fixes: > 19183/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MVHA_fuzzer-5666216765292544 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/mvha.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/libavcodec/mvha.c b/libavcodec/mvha.c > index 4b03a79283..c270063b1c 100644 > --- a/libavcodec/mvha.c > +++ b/libavcodec/mvha.c > @@ -203,6 +203,9 @@ static int decode_frame(AVCodecContext *avctx, > for (int i = 0; i < s->nb_symbols; symbol++) { > int prob; > > + if (get_bits_left(gb) < 4) > + return AVERROR_INVALIDDATA; > + > if (get_bits1(gb)) { > prob = get_bits(gb, 12); > } else { > -- > 2.23.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Fri, Dec 06, 2019 at 12:37:36AM +0100, Paul B Mahol wrote:
> LGTM
will apply
thx
[...]
diff --git a/libavcodec/mvha.c b/libavcodec/mvha.c index 4b03a79283..c270063b1c 100644 --- a/libavcodec/mvha.c +++ b/libavcodec/mvha.c @@ -203,6 +203,9 @@ static int decode_frame(AVCodecContext *avctx, for (int i = 0; i < s->nb_symbols; symbol++) { int prob; + if (get_bits_left(gb) < 4) + return AVERROR_INVALIDDATA; + if (get_bits1(gb)) { prob = get_bits(gb, 12); } else {
Fixes: Infinite loop Fixes: 19183/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MVHA_fuzzer-5666216765292544 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/mvha.c | 3 +++ 1 file changed, 3 insertions(+)