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

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

[Peter Ross]

[-- Attachment #1.1: Type: text/plain, Size: 1044 bytes --]

Fixes ticket #5387
---
 libavcodec/svq3.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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);
     }
 
-- 
2.35.1

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".