Message ID | 20170917004211.12545-2-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | 5480e82d77770e81e897a8c217f3c7f0c13a6de1 |
Headers | show |
On 9/16/2017 9:42 PM, Michael Niedermayer wrote: > Fixes: memleak > Fixes: 3203/clusterfuzz-testcase-minimized-4514553595428864 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/pngdec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c > index dce8faf168..0d6612ccca 100644 > --- a/libavcodec/pngdec.c > +++ b/libavcodec/pngdec.c > @@ -1414,7 +1414,7 @@ static int decode_frame_png(AVCodecContext *avctx, > } > > if ((ret = av_frame_ref(data, s->picture.f)) < 0) > - return ret; > + goto the_end; > > *got_frame = 1; > LGTM.
On Tue, Sep 19, 2017 at 01:00:52AM -0300, James Almer wrote: > On 9/16/2017 9:42 PM, Michael Niedermayer wrote: > > Fixes: memleak > > Fixes: 3203/clusterfuzz-testcase-minimized-4514553595428864 > > > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/pngdec.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c > > index dce8faf168..0d6612ccca 100644 > > --- a/libavcodec/pngdec.c > > +++ b/libavcodec/pngdec.c > > @@ -1414,7 +1414,7 @@ static int decode_frame_png(AVCodecContext *avctx, > > } > > > > if ((ret = av_frame_ref(data, s->picture.f)) < 0) > > - return ret; > > + goto the_end; > > > > *got_frame = 1; > > > > LGTM. will apply thanks [...]
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index dce8faf168..0d6612ccca 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1414,7 +1414,7 @@ static int decode_frame_png(AVCodecContext *avctx, } if ((ret = av_frame_ref(data, s->picture.f)) < 0) - return ret; + goto the_end; *got_frame = 1;
Fixes: memleak Fixes: 3203/clusterfuzz-testcase-minimized-4514553595428864 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/pngdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)