aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-02-28 11:35:36 -0800
committerRonald S. Bultje <rsbultje@gmail.com>2012-02-28 11:58:13 -0800
commit934cd18a43151ba4b819d9270d539cdb26f6e079 (patch)
tree0e9e0bbd18828bd445265aafca84ba39af02dd2f
parentcfac648e6af31e1ea58ddc753677761d83d89710 (diff)
downloadffmpeg-934cd18a43151ba4b819d9270d539cdb26f6e079.tar.gz
oma: don't read beyond end of leaf_table.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
-rw-r--r--libavformat/omadec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index fc9c2921e6..7c54ffbc97 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -231,7 +231,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
rprobe(s, gdata, oc->r_val) < 0 &&
nprobe(s, gdata, oc->n_val) < 0) {
int i;
- for (i = 0; i < sizeof(leaf_table); i += 2) {
+ for (i = 0; i < FF_ARRAY_ELEMS(leaf_table); i += 2) {
uint8_t buf[16];
AV_WL64(buf, leaf_table[i]);
AV_WL64(&buf[8], leaf_table[i+1]);