This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch release/8.1
in repository ffmpeg.

commit 9cbcf979a587a66b280496657d00fabe301bf20f
Author:     Michael Niedermayer <[email protected]>
AuthorDate: Tue Jun 30 00:24:07 2026 +0200
Commit:     Adam Shaver <[email protected]>
CommitDate: Mon Aug 3 18:38:53 2026 +0000

    avcodec/nvdec: don't double free the fdd-owned context on the sep_ref error 
path
    
    Fixes: double free
    Fixes: rpSz7v3yq2u8
    Fixes: 72982f8cb5dad6252a14226d28128313eed4a5ff (avcodec/nvdec: add support 
for separate reference frame)
    Found-by: Pavel Kohout (Aisle Research)
    Signed-off-by: Michael Niedermayer <[email protected]>
    (cherry picked from commit 4c6217477fc64305055b37d9d1d0d76d30e37f97)
    Signed-off-by: Michael Niedermayer <[email protected]>
    (cherry picked from commit 3d5ad47c40436dbdeaaa6601af0bb4575d5aa3c5)
    Signed-off-by: Adam Shaver <[email protected]>
---
 libavcodec/nvdec.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c
index 7c29f25718..787a9d7c28 100644
--- a/libavcodec/nvdec.c
+++ b/libavcodec/nvdec.c
@@ -628,8 +628,7 @@ int ff_nvdec_start_frame_sep_ref(AVCodecContext *avctx, 
AVFrame *frame, int has_
             cf->ref_idx_ref = av_refstruct_pool_get(ctx->decoder_pool);
             if (!cf->ref_idx_ref) {
                 av_log(avctx, AV_LOG_ERROR, "No decoder surfaces left\n");
-                ret = AVERROR(ENOMEM);
-                goto fail;
+                return AVERROR(ENOMEM);
             }
         }
         cf->ref_idx = *cf->ref_idx_ref;
@@ -639,9 +638,6 @@ int ff_nvdec_start_frame_sep_ref(AVCodecContext *avctx, 
AVFrame *frame, int has_
     }
 
     return 0;
-fail:
-    nvdec_fdd_priv_free(cf);
-    return ret;
 }
 
 int ff_nvdec_end_frame(AVCodecContext *avctx)

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to