From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 06/15] avcodec/hw_base_encode: Simplify EOF check
Date: Fri, 5 Jul 2024 02:21:47 +0200
Message-ID: <20240705002156.1964272-6-michael@niedermayer.cc> (raw)
In-Reply-To: <20240705002156.1964272-1-michael@niedermayer.cc>
Found while reviewing CID1608712 Explicit null dereferenced
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/hw_base_encode.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c
index ecb4be6aa43..6d5632c2988 100644
--- a/libavcodec/hw_base_encode.c
+++ b/libavcodec/hw_base_encode.c
@@ -546,11 +546,10 @@ start:
}
err = ff_encode_get_frame(avctx, frame);
- if (err < 0 && err != AVERROR_EOF)
- return err;
-
- if (err == AVERROR_EOF)
+ if (err == AVERROR_EOF) {
frame = NULL;
+ } else if (err < 0)
+ return err;
err = hw_base_encode_send_frame(avctx, ctx, frame);
if (err < 0)
--
2.45.2
_______________________________________________
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-07-05 0:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-05 0:21 [FFmpeg-devel] [PATCH 01/15] avcodec/xsubdec: Check parse_timecode() Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 02/15] avcodec/cri: Check length Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 03/15] avcodec/dxv: Fix type in get_opcodes() Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 04/15] avcodec/golomb: Document return for get_ur_golomb_jpegls() and get_sr_golomb_flac() Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 05/15] avcodec/golomb: Assert that k is in the supported range for get_ur/sr_golomb() Michael Niedermayer
2024-07-05 0:21 ` Michael Niedermayer [this message]
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 07/15] avcodec/iff: Use signed count Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 08/15] avcodec/imm4: check cbphi for error Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 09/15] avcodec/leaddec: Check init_get_bits8() for failure Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 10/15] avcodec/loco: check get_ur_golomb_jpegls() " Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 11/15] avcodec/loco: Check loco_get_rice() " Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 12/15] avcodec/me_cmp: Fix type check Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 13/15] avcodec/mlpenc: Use 64 for ml, mr Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 14/15] avcodec/motion_est: Fix score squaring overflow Michael Niedermayer
2024-07-05 0:21 ` [FFmpeg-devel] [PATCH 15/15] avcodec/pixlet: Simplify pfx computation Michael Niedermayer
2024-07-12 20:41 ` [FFmpeg-devel] [PATCH 01/15] avcodec/xsubdec: Check parse_timecode() 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=20240705002156.1964272-6-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--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