Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 06/11] avcodec/vaapi_encode: Check hwctx
Date: Sat, 20 Jul 2024 02:52:36 +0200
Message-ID: <20240720005241.726089-6-michael@niedermayer.cc> (raw)
In-Reply-To: <20240720005241.726089-1-michael@niedermayer.cc>

Fixes: null pointer dereference
Fixes: 70376/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_VAAPI_fuzzer-4733551250046976

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/vaapi_encode.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index 48ca0187758..afdf3fe3d8c 100644
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -2307,12 +2307,14 @@ av_cold int ff_vaapi_encode_close(AVCodecContext *avctx)
     ff_refstruct_pool_uninit(&ctx->output_buffer_pool);
 
     if (ctx->va_context != VA_INVALID_ID) {
-        vaDestroyContext(ctx->hwctx->display, ctx->va_context);
+        if (ctx->hwctx)
+            vaDestroyContext(ctx->hwctx->display, ctx->va_context);
         ctx->va_context = VA_INVALID_ID;
     }
 
     if (ctx->va_config != VA_INVALID_ID) {
-        vaDestroyConfig(ctx->hwctx->display, ctx->va_config);
+        if (ctx->hwctx)
+            vaDestroyConfig(ctx->hwctx->display, ctx->va_config);
         ctx->va_config = VA_INVALID_ID;
     }
 
-- 
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".

  parent reply	other threads:[~2024-07-20  0:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-20  0:52 [FFmpeg-devel] [PATCH 01/11] avcodec/alsdec: Clear shift_value Michael Niedermayer
2024-07-20  0:52 ` [FFmpeg-devel] [PATCH 02/11] avcodec/proresdec: Consider negative bits left Michael Niedermayer
2024-07-20  0:52 ` [FFmpeg-devel] [PATCH 03/11] avcodec/hevc/hevcdec: avoid signed shifts with lt_idx_sps Michael Niedermayer
2024-07-20  0:52 ` [FFmpeg-devel] [PATCH 04/11] avcodec/aac/aacdec_usac: Dont leave invalid max_sfb in the context Michael Niedermayer
2024-07-20  0:52 ` [FFmpeg-devel] [PATCH 05/11] avcodec/aac/aacdec_lpd: Check kv indec Michael Niedermayer
2024-07-20  0:52 ` Michael Niedermayer [this message]
2024-07-20  0:52 ` [FFmpeg-devel] [PATCH 07/11] avcodec/osq: avoid using too large numbers for shifts and integers in update_residue_parameter() Michael Niedermayer
2024-07-20  0:52 ` [FFmpeg-devel] [PATCH 08/11] avcodec/osq: fix integer overflow when applying factor Michael Niedermayer
2024-07-20  0:52 ` [FFmpeg-devel] [PATCH 09/11] avcodec/cfhdenc: Allocate more space Michael Niedermayer
2024-07-20  0:52 ` [FFmpeg-devel] [PATCH 10/11] avcodec/cfhdenc: Height of 16 is not supported Michael Niedermayer
2024-07-20  0:52 ` [FFmpeg-devel] [PATCH 11/11] avcodec/hdrenc: Allocate more space Michael Niedermayer
2024-07-23 18:37 ` [FFmpeg-devel] [PATCH 01/11] avcodec/alsdec: Clear shift_value 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=20240720005241.726089-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