[FFmpeg-devel] [PATCH] avcodec/hevc: Fix invalid null pointer check (PR #20290)

[Zhao Zhili]

PR #20290 opened by Zhao Zhili (quink)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20290
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20290.patch

c5287178b4d added a null pointer check, but checked the wrong
variable. &s->cur_frame->f->data[c_idx] cannot be null.


From c9eb2d1e047e079f542bdd3a789594fbc4151001 Mon Sep 17 00:00:00 2001
From: Zhao Zhili <zhilizhao at tencent.com>
Date: Wed, 20 Aug 2025 09:46:47 +0100
Subject: [PATCH] avcodec/hevc: Fix invalid null pointer check

c5287178b4d added a null pointer check, but checked the wrong
variable. &s->cur_frame->f->data[c_idx] cannot be null.
---
 libavcodec/hevc/hevcdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c
index f44bda8a92..d3e5e58cfc 100644
--- a/libavcodec/hevc/hevcdec.c
+++ b/libavcodec/hevc/hevcdec.c
@@ -2096,7 +2096,7 @@ static void hls_prediction_unit(HEVCLocalContext *lc,
                                 int log2_cb_size, int partIdx, int idx)
 {
 #define POS(c_idx, x, y)                                                          \
-    &s->cur_frame->f->data[c_idx] ?                                               \
+    s->cur_frame->f->data[c_idx] ?                                                \
     &s->cur_frame->f->data[c_idx][((y) >> sps->vshift[c_idx]) * linesize[c_idx] + \
                            (((x) >> sps->hshift[c_idx]) << sps->pixel_shift)] : NULL
     const HEVCContext *const s = lc->parent;
-- 
2.49.1