aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-16 18:13:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-16 18:36:39 +0200
commita30165c4a8044e1d5527c1302b5a5cb473e0913d (patch)
treebf87ffcec77306532d2236518f74ad1e363af991 /libavformat
parentc963189bc2fcb879acff100be341222ee8aa850a (diff)
downloadffmpeg-a30165c4a8044e1d5527c1302b5a5cb473e0913d.tar.gz
omadec: make sample rate table large enough to prevent out of array reading.
The new values lead to error messages when used Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/oma.c2
-rw-r--r--libavformat/oma.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/oma.c b/libavformat/oma.c
index 30e86f10bb..d4dfb1a265 100644
--- a/libavformat/oma.c
+++ b/libavformat/oma.c
@@ -22,7 +22,7 @@
#include "oma.h"
#include "libavcodec/avcodec.h"
-const uint16_t ff_oma_srate_tab[6] = { 320, 441, 480, 882, 960, 0 };
+const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0, 0, 0};
const AVCodecTag ff_oma_codec_tags[] = {
{ CODEC_ID_ATRAC3, OMA_CODECID_ATRAC3 },
diff --git a/libavformat/oma.h b/libavformat/oma.h
index bac8bcb736..1f0ddf9a88 100644
--- a/libavformat/oma.h
+++ b/libavformat/oma.h
@@ -37,7 +37,7 @@ enum {
OMA_CODECID_WMA = 5,
};
-extern const uint16_t ff_oma_srate_tab[6];
+extern const uint16_t ff_oma_srate_tab[8];
extern const AVCodecTag ff_oma_codec_tags[];