[FFmpeg-cvslog] avcodec/vvcdec: inter_data, check the return value from hls_merge_data

[Nuo Mi]

ffmpeg | branch: master | Nuo Mi <nuomi2021 at gmail.com> | Sat Nov 23 17:32:35 2024 +0800| [ba89c5b989938fad751ac451d1f6ef813bb42460] | committer: Nuo Mi

avcodec/vvcdec: inter_data, check the return value from hls_merge_data

Reported-by: Frank Plowman <post at frankplowman.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba89c5b989938fad751ac451d1f6ef813bb42460
---

 libavcodec/vvc/ctu.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c
index 1e06119cfd..6c0c52b836 100644
--- a/libavcodec/vvc/ctu.c
+++ b/libavcodec/vvc/ctu.c
@@ -1778,13 +1778,16 @@ static int inter_data(VVCLocalContext *lc)
         pu->general_merge_flag = ff_vvc_general_merge_flag(lc);
 
     if (pu->general_merge_flag) {
-        hls_merge_data(lc);
+        ret = hls_merge_data(lc);
     } else if (cu->pred_mode == MODE_IBC){
         ret = mvp_data_ibc(lc);
     } else {
         ret = mvp_data(lc);
     }
 
+    if (ret)
+        return ret;
+
     if (cu->pred_mode == MODE_IBC)
     {
         ff_vvc_update_hmvp(lc, mi);