From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 4/7] avcodec/avs2_parser: Assert init_get_bits8() success with const size 15
Date: Thu, 2 May 2024 10:25:24 +0200
Message-ID: <AS8P250MB0744F5AF79EE35AC1DE428A08F182@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <20240502004150.3627661-4-michael@niedermayer.cc>
Michael Niedermayer:
> Fixes: CID1506708 Unchecked return value
>
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> libavcodec/avs2_parser.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c
> index 200134f91db..8d4bc3cee0d 100644
> --- a/libavcodec/avs2_parser.c
> +++ b/libavcodec/avs2_parser.c
> @@ -72,13 +72,15 @@ static void parse_avs2_seq_header(AVCodecParserContext *s, const uint8_t *buf,
> unsigned aspect_ratio;
> unsigned frame_rate_code;
> int low_delay;
> + int ret;
> // update buf_size_min if parse more deeper
> const int buf_size_min = 15;
>
> if (buf_size < buf_size_min)
> return;
>
> - init_get_bits8(&gb, buf, buf_size_min);
> + ret = init_get_bits8(&gb, buf, buf_size_min);
> + av_assert2(ret >= 0);
>
> s->key_frame = 1;
> s->pict_type = AV_PICTURE_TYPE_I;
Code like this may trigger set-but-unused variable warnings when
ASSERT_LEVEL is <= 1. Add av_unused to ret to fix this.
Apart from that, it should be av_assert1 (this is not hot).
- 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-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2024-05-02 8:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 0:41 [FFmpeg-devel] [PATCH 1/7] avcodec/av1dec: bit_depth cannot be another values than 8, 10, 12 Michael Niedermayer
2024-05-02 0:41 ` [FFmpeg-devel] [PATCH 2/7] avcodec/av1dec: initialize ret in av1_receive_frame_internal() Michael Niedermayer
2024-05-02 0:55 ` James Almer
2024-05-02 7:12 ` Andreas Rheinhardt
2024-05-02 21:29 ` Michael Niedermayer
2024-05-02 21:34 ` Andreas Rheinhardt
2024-05-02 21:41 ` Michael Niedermayer
2024-05-02 0:41 ` [FFmpeg-devel] [PATCH 3/7] avcodec/avfft: Remove dead code Michael Niedermayer
2024-05-02 1:21 ` Lynne
2024-05-02 1:28 ` Michael Niedermayer
2024-05-02 0:41 ` [FFmpeg-devel] [PATCH 4/7] avcodec/avs2_parser: Assert init_get_bits8() success with const size 15 Michael Niedermayer
2024-05-02 8:25 ` Andreas Rheinhardt [this message]
2024-05-02 21:32 ` Michael Niedermayer
2024-05-02 0:41 ` [FFmpeg-devel] [PATCH 5/7] avcodec/avs3_parser: Check the return value of init_get_bits8() Michael Niedermayer
2024-05-02 8:28 ` Andreas Rheinhardt
2024-05-02 21:53 ` Michael Niedermayer
2024-05-02 0:41 ` [FFmpeg-devel] [PATCH 6/7] avcodec/cbs_av1: Avoid shift overflow Michael Niedermayer
2024-05-09 1:33 ` Michael Niedermayer
2024-05-02 0:41 ` [FFmpeg-devel] [PATCH 7/7] avcodec/cbs_jpeg: Try to move the read entity to one side in a test Michael Niedermayer
2024-05-02 6:58 ` Andreas Rheinhardt
2024-05-02 22:03 ` Michael Niedermayer
2024-07-02 18:29 ` Michael Niedermayer
2024-05-02 0:56 ` [FFmpeg-devel] [PATCH 1/7] avcodec/av1dec: bit_depth cannot be another values than 8, 10, 12 James Almer
2024-05-02 22:12 ` Michael Niedermayer
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=AS8P250MB0744F5AF79EE35AC1DE428A08F182@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/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