[libav-stable] omadec: check GEOB sizes against buffer size

Michael Niedermayer git at libav.org
Mon Nov 4 18:54:05 CET 2013


Module: libav
Branch: master
Commit: 1c736bedd9891501960ebac0f7c05eb60225e947

Author:    Michael Niedermayer <michaelni at gmx.at>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Thu Oct 24 15:24:25 2013 +0200

omadec: check GEOB sizes against buffer size

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich at gmail.com>
CC:libav-stable at libav.org
Signed-off-by: Anton Khirnov <anton at khirnov.net>

---

 libavformat/omadec.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index 98ccbde..eeab70e 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -237,6 +237,11 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
         av_log(s, AV_LOG_ERROR, "Invalid encryption header\n");
         return AVERROR_INVALIDDATA;
     }
+    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;
+    }
     oc->rid = AV_RB32(&gdata[OMA_ENC_HEADER_SIZE + 28]);
     av_log(s, AV_LOG_DEBUG, "RID: %.8x\n", oc->rid);
 



More information about the libav-stable mailing list