Michael Niedermayer: > Fixes: memleak > Fixes: > 26450/clusterfuzz-testcase-minimized-ffmpeg_dem_FFMETADATA_fuzzer-6249850443923456 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > --- > libavformat/ffmetadec.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c > index 0ea89fe3f3..9fcba08490 100644 > --- a/libavformat/ffmetadec.c > +++ b/libavformat/ffmetadec.c > @@ -185,7 +185,7 @@ static int read_header(AVFormatContext *s) > AVStream *st = avformat_new_stream(s, NULL); > > if (!st) > - return AVERROR(ENOMEM); > + goto nomem; > > st->codecpar->codec_type = AVMEDIA_TYPE_DATA; > st->codecpar->codec_id = AV_CODEC_ID_FFMETADATA; > @@ -195,7 +195,7 @@ static int read_header(AVFormatContext *s) > AVChapter *ch = read_chapter(s); > > if (!ch) > - return AVERROR(ENOMEM); > + goto nomem; > > m = &ch->metadata; > } else > @@ -211,6 +211,10 @@ static int read_header(AVFormatContext *s) > AV_TIME_BASE_Q); > > return 0; > +nomem: > + av_bprint_finalize(&bp, NULL); > + > + return AVERROR(ENOMEM); > } > > static int read_packet(AVFormatContext *s, AVPacket *pkt) > LGTM.
- Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
