diff mbox

[FFmpeg-devel,1/2] avcodec/pnm_parser: clear state if buffer is discarded

Message ID 20190503233838.29823-1-michael@niedermayer.cc
State Accepted
Commit 3afdd3e11a2d1239aca7c6350110aee7371d862e
Headers show

Commit Message

Michael Niedermayer May 3, 2019, 11:38 p.m. UTC 
Fixes: Assertion failure
Fixes: 14484/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-5150016408125440

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/pnm_parser.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Paul B Mahol May 4, 2019, 8:08 a.m. UTC | #1 
On 5/4/19, Michael Niedermayer <michael@niedermayer.cc> wrote:
> Fixes: Assertion failure
> Fixes:
> 14484/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-5150016408125440
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/pnm_parser.c | 1 +
>  1 file changed, 1 insertion(+)

lgtm
Michael Niedermayer May 4, 2019, 6:18 p.m. UTC | #2 
On Sat, May 04, 2019 at 10:08:38AM +0200, Paul B Mahol wrote:
> On 5/4/19, Michael Niedermayer <michael@niedermayer.cc> wrote:
> > Fixes: Assertion failure
> > Fixes:
> > 14484/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-5150016408125440
> >
> > Found-by: continuous fuzzing process
> > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/pnm_parser.c | 1 +
> >  1 file changed, 1 insertion(+)
> 
> lgtm

will apply

thx

[...]
diff mbox

Patch

diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c
index de0e32ba9c..5339bebde9 100644
--- a/libavcodec/pnm_parser.c
+++ b/libavcodec/pnm_parser.c
@@ -69,6 +69,7 @@  retry:
         if (pnmctx.bytestream < pnmctx.bytestream_end) {
             if (pc->index) {
                 pc->index = 0;
+                pnmpc->ascii_scan = 0;
             } else {
                 unsigned step = FFMAX(1, pnmctx.bytestream - pnmctx.bytestream_start);