[FFmpeg-cvslog] omadec: Check geob datasize more completely

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 10 17:22:27 2012 +0200| [91e72e35141f590c38985ad0ae3453a4e9e86b8a] | committer: Michael Niedermayer

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 at gmx.at>

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

 libavformat/omadec.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index c88d4f4..1cd8fdf 100644
--- 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;
     }