projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e739969
)
omadec: Fix wrong number of array elements
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 24 Oct 2013 13:24:24 +0000
(15:24 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Mon, 4 Nov 2013 17:38:01 +0000
(18:38 +0100)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavformat/omadec.c
patch
|
blob
|
history
diff --git
a/libavformat/omadec.c
b/libavformat/omadec.c
index
e5a2090
..
98ccbde
100644
(file)
--- 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;
}