diff mbox series

[FFmpeg-devel] avcodec/svq3: perform residual slice copy before xor'ing watermark key

Message ID 1cf46f33b16c0ae34d1f6f193a051220211f5d04.1666899957.git.pross@xvid.org
State Accepted
Commit 95386b7b65dab6fb72bf76c14470904782642ebc
Headers show
Series [FFmpeg-devel] avcodec/svq3: perform residual slice copy before xor'ing watermark key | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Peter Ross Oct. 27, 2022, 7:46 p.m. UTC 
Fixes ticket #5387
---
 libavcodec/svq3.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 7e8f16cc72..b96c4f61f6 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -1037,15 +1037,16 @@  static int svq3_decode_slice_header(AVCodecContext *avctx)
         }
         memcpy(s->slice_buf, s->gb.buffer + s->gb.index / 8, slice_bytes);
 
+        if (length > 0) {
+            memmove(s->slice_buf, &s->slice_buf[slice_length], length - 1);
+        }
+
         if (s->watermark_key) {
             uint32_t header = AV_RL32(&s->slice_buf[1]);
             AV_WL32(&s->slice_buf[1], header ^ s->watermark_key);
         }
         init_get_bits(&s->gb_slice, s->slice_buf, slice_bits);
 
-        if (length > 0) {
-            memmove(s->slice_buf, &s->slice_buf[slice_length], length - 1);
-        }
         skip_bits_long(&s->gb, slice_bytes * 8);
     }