diff mbox series

[FFmpeg-devel,1/2] avformat/concatdec: Use FAIL() macro instead of direct return in concat_parse_script()

Message ID 20210921231438.16335-1-michael@niedermayer.cc
State Accepted
Commit 0b761e87c044fe46746eb5849991d0deea40778e
Headers show
Series [FFmpeg-devel,1/2] avformat/concatdec: Use FAIL() macro instead of direct return in concat_parse_script() | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Michael Niedermayer Sept. 21, 2021, 11:14 p.m. UTC 
Fixes: memleak
Fixes: 38893/clusterfuzz-testcase-minimized-ffmpeg_dem_CONCAT_fuzzer-4785231933079552

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

Comments

Nicolas George Sept. 22, 2021, 11:20 a.m. UTC | #1 
Michael Niedermayer (12021-09-22):
> Fixes: memleak
> Fixes: 38893/clusterfuzz-testcase-minimized-ffmpeg_dem_CONCAT_fuzzer-4785231933079552
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/concatdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Yes, thanks.

Regards,
Michael Niedermayer Sept. 22, 2021, 4:48 p.m. UTC | #2 
On Wed, Sep 22, 2021 at 01:20:16PM +0200, Nicolas George wrote:
> Michael Niedermayer (12021-09-22):
> > Fixes: memleak
> > Fixes: 38893/clusterfuzz-testcase-minimized-ffmpeg_dem_CONCAT_fuzzer-4785231933079552
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavformat/concatdec.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Yes, thanks.

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 0886dad88b2..2557f38b26c 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -627,7 +627,7 @@  static int concat_parse_script(AVFormatContext *avf)
             chapter = avpriv_new_chapter(avf, arg_int[0], AV_TIME_BASE_Q,
                                          arg_int[1], arg_int[2], NULL);
             if (!chapter)
-                return AVERROR(ENOMEM);
+                FAIL(ENOMEM);
             break;
 
         default: