omadec: Check geob datasize more completely

Fixes out of heap array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index c88d4f4d481ca00fe86c29508e1b1edd659be2d0..1cd8fdf9d5d44b2348a8c367bd24a6bb8acf655c 100644 (file)
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -219,7 +219,9 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
         av_log(s, AV_LOG_ERROR, "Invalid encryption header\n");
         return -1;
     }
-    if (oc->k_size + oc->e_size + oc->i_size > geob->datasize) {
+    if (   OMA_ENC_HEADER_SIZE + oc->k_size + oc->e_size + oc->i_size + 8 > geob->datasize
+        || OMA_ENC_HEADER_SIZE + 48 > geob->datasize
+    ) {
         av_log(s, AV_LOG_ERROR, "Too little GEOB data\n");
         return AVERROR_INVALIDDATA;
     }