From 135acc8e61cf294e09c00eee43482cc0bc624249 Mon Sep 17 00:00:00 2001
From: Mark Thompson <sw@jkqxz.net>
Date: Sat, 3 May 2025 17:04:32 +0100
Subject: [PATCH] cbs_apv: Always restore tracing state on split fragment error

Fixes CID 1646769.
---
 libavcodec/cbs_apv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/cbs_apv.c b/libavcodec/cbs_apv.c
index e7dd04825c..ebf57d3bbb 100644
--- a/libavcodec/cbs_apv.c
+++ b/libavcodec/cbs_apv.c
@@ -230,14 +230,14 @@ static int cbs_apv_split_fragment(CodedBitstreamContext *ctx,
 
         err = cbs_apv_read_pbu_header(ctx, &gbc, &pbu_header);
         if (err < 0)
-            return err;
+            goto fail;
 
         // Could select/skip frames based on type/group_id here.
 
         err = ff_cbs_append_unit_data(frag, pbu_header.pbu_type,
                                       data, pbu_size, frag->data_ref);
         if (err < 0)
-            return err;
+            goto fail;
 
         data += pbu_size;
         size -= pbu_size;