apply CVE patch for security weakness

Change-Id: Ie7c401f1424312e2e6c2193df990525d30439083

diff --git a/gst-libs/gst/codecparsers/dboolhuff.c b/gst-libs/gst/codecparsers/dboolhuff.c
index 692d78b..c8e1856 100644 (file)
--- a/gst-libs/gst/codecparsers/dboolhuff.c
+++ b/gst-libs/gst/codecparsers/dboolhuff.c
@@ -39,7 +39,7 @@ vp8dx_bool_decoder_fill (BOOL_DECODER * br)
   const unsigned char *bufptr = br->user_buffer;
   VP8_BD_VALUE value = br->value;
   int count = br->count;
-  int shift = VP8_BD_VALUE_SIZE - 8 - (count + 8);
+  int shift = VP8_BD_VALUE_SIZE - CHAR_BIT - (count + CHAR_BIT);
   size_t bytes_left = br->user_buffer_end - bufptr;
   size_t bits_left = bytes_left * CHAR_BIT;
   int x = (int) (shift + CHAR_BIT - bits_left);
@@ -48,7 +48,7 @@ vp8dx_bool_decoder_fill (BOOL_DECODER * br)
 
   if (br->decrypt_cb) {
     size_t n =
-        bytes_left > sizeof (decrypted) ? sizeof (decrypted) : bytes_left;
+        MIN (sizeof (decrypted), bytes_left);
     br->decrypt_cb (br->decrypt_state, bufptr, decrypted, (int) n);
     bufptr = decrypted;
   }