[FFmpeg-cvslog] avformat/vividas: fix undefined behaviour

Paul B Mahol git at videolan.org
Sat Dec 22 12:16:13 EET 2018


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Dec 22 10:39:03 2018 +0100| [14c2f7f65260cbd1475075edf9acf2b82c8dcb36] | committer: Paul B Mahol

avformat/vividas: fix undefined behaviour

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

 libavformat/vividas.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index 31f8c47ca4..dc446929c3 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -121,11 +121,11 @@ static unsigned recover_key(unsigned char sample[4], unsigned expected_size)
         ((sample[3]^plaintext[3])<<24);
 }
 
-static void xor_block(void *p1, void *p2, unsigned size, int key, int *key_ptr)
+static void xor_block(void *p1, void *p2, unsigned size, int key, unsigned *key_ptr)
 {
-    int *d1 = p1;
-    int *d2 = p2;
-    int k = *key_ptr;
+    unsigned *d1 = p1;
+    unsigned *d2 = p2;
+    unsigned k = *key_ptr;
 
     size >>= 2;
 



More information about the ffmpeg-cvslog mailing list