From: Paul B Mahol <onemda@gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Jiasheng Jiang <jiasheng@iscas.ac.cn> Subject: Re: [FFmpeg-devel] [PATCH] avformat: Add check for ff_get_extradata Date: Tue, 22 Feb 2022 09:10:51 +0100 Message-ID: <CAPYw7P4ZT+DyYme7x+Vme9UNP1=1Uuathj-TiZ6u2wASASNn8A@mail.gmail.com> (raw) In-Reply-To: <20220222074953.2788880-1-jiasheng@iscas.ac.cn> On Tue, Feb 22, 2022 at 8:50 AM Jiasheng Jiang <jiasheng@iscas.ac.cn> wrote: > As the potential failure of the memory allocation, the ff_get_extradata() > could return error if fails. > Therefore, it should be better to deal with the return value of the > ff_get_extradata() and return error if fails. > Not really necessary. Does not fix anything. > > Fixes: 2d720069a9 ("avformat: add aix demuxer") > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> > --- > libavformat/aixdec.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/libavformat/aixdec.c b/libavformat/aixdec.c > index 59c3d60da3..89f73b6913 100644 > --- a/libavformat/aixdec.c > +++ b/libavformat/aixdec.c > @@ -40,7 +40,7 @@ static int aix_read_header(AVFormatContext *s) > unsigned segment_list_offset = 0x20; > unsigned segment_list_entry_size = 0x10; > unsigned size; > - int i; > + int i, ret; > > avio_skip(s->pb, 4); > first_offset = avio_rb32(s->pb) + 8; > @@ -77,7 +77,9 @@ static int aix_read_header(AVFormatContext *s) > if (size <= 8) > return AVERROR_INVALIDDATA; > avio_skip(s->pb, 8); > - ff_get_extradata(s, s->streams[i]->codecpar, s->pb, size - 8); > + ret = ff_get_extradata(s, s->streams[i]->codecpar, s->pb, size - > 8); > + if (ret < 0) > + return ret; > } > > return 0; > -- > 2.25.1 > > _______________________________________________ > 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". > _______________________________________________ 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".
next prev parent reply other threads:[~2022-02-22 8:09 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-22 7:49 Jiasheng Jiang 2022-02-22 8:10 ` Paul B Mahol [this message] 2022-02-22 9:14 Jiasheng Jiang 2022-02-22 9:30 ` Paul B Mahol
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAPYw7P4ZT+DyYme7x+Vme9UNP1=1Uuathj-TiZ6u2wASASNn8A@mail.gmail.com' \ --to=onemda@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=jiasheng@iscas.ac.cn \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git