From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/pgxdec: Remove pointless checks Date: Sun, 24 Apr 2022 06:42:54 +0200 Message-ID: <AS8PR01MB79441EAB2E52898C305280F58FF99@AS8PR01MB7944.eurprd01.prod.exchangelabs.com> (raw) In-Reply-To: <AS8PR01MB79440FF78671075B4A5A8C988FF99@AS8PR01MB7944.eurprd01.prod.exchangelabs.com> These checks were (most likely) added to check for overreads as the bytestream2_get_* functions return 0 in this case. Yet this is not necessary anymore as we now have an explicit check for the size. Should the input contain a real \0, pgx_get_number() will error out lateron. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/pgxdec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c index 9c474036da..c9ada5afb5 100644 --- a/libavcodec/pgxdec.c +++ b/libavcodec/pgxdec.c @@ -69,14 +69,11 @@ static int pgx_decode_header(AVCodecContext *avctx, GetByteContext *g, } else if (byte == '-') { *sign = 1; bytestream2_skipu(g, 1); - } else if (byte == 0) - goto error; + } byte = bytestream2_peek_byteu(g); if (byte == ' ') bytestream2_skipu(g, 1); - else if (byte == 0) - goto error; if (pgx_get_number(avctx, g, depth)) goto error; -- 2.32.0 _______________________________________________ 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-04-24 4:43 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-24 4:39 [FFmpeg-devel] [PATCH 1/7] avcodec/pgxdec: Make better use of size check Andreas Rheinhardt 2022-04-24 4:42 ` [FFmpeg-devel] [PATCH 2/7] avcodec/pgxdec: Avoid always-false checks Andreas Rheinhardt 2022-04-24 11:18 ` Paul B Mahol 2022-04-24 4:42 ` Andreas Rheinhardt [this message] 2022-04-24 11:17 ` [FFmpeg-devel] [PATCH 3/7] avcodec/pgxdec: Remove pointless checks Paul B Mahol 2022-04-24 4:42 ` [FFmpeg-devel] [PATCH 4/7] avcodec/pgxdec: Fix issue with negative linesizes Andreas Rheinhardt 2022-04-24 11:15 ` Paul B Mahol 2022-04-24 4:42 ` [FFmpeg-devel] [PATCH 5/7] avcodec/pgxdec: Hoist branch out of loop Andreas Rheinhardt 2022-04-24 11:16 ` Paul B Mahol 2022-04-24 4:42 ` [FFmpeg-devel] [PATCH 6/7] avcodec/pgxdec: Use unsigned types for unsigned values Andreas Rheinhardt 2022-04-24 11:16 ` Paul B Mahol 2022-04-24 4:42 ` [FFmpeg-devel] [PATCH 7/7] avcodec/xfacedec: Add AV_CODEC_CAP_DR1 Andreas Rheinhardt 2022-04-24 11:12 ` Paul B Mahol 2022-04-24 11:18 ` [FFmpeg-devel] [PATCH 1/7] avcodec/pgxdec: Make better use of size check 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=AS8PR01MB79441EAB2E52898C305280F58FF99@AS8PR01MB7944.eurprd01.prod.exchangelabs.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