[libav-stable] omadec: Fix wrong number of array elements

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


Module: libav
Branch: master
Commit: 97f50e92b5cf3b47a76f75d76ed4340e822030db

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

omadec: Fix wrong number of array elements

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 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index e5a2090..98ccbde 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -263,7 +263,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
                 !nprobe(s, gdata, geob->datasize, oc->n_val))
                 break;
         }
-        if (i >= sizeof(leaf_table)) {
+        if (i >= FF_ARRAY_ELEMS(leaf_table)) {
             av_log(s, AV_LOG_ERROR, "Invalid key\n");
             return AVERROR_INVALIDDATA;
         }



More information about the libav-stable mailing list