diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-08 22:37:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-08 22:37:31 +0200 |
| commit | 78d7d8fe9170f38ee0b2ab6f731ff1a61c712db5 (patch) | |
| tree | 3fa4f47e3f1cca5a0cf39b42a5d171dec9a5b53f /libavformat/avlanguage.c | |
| parent | 04c13dca8812e8302686887b6e8201d4ad25b7d8 (diff) | |
| parent | 6376362d15ccbc02e15d0b3b7a7a5d862efd6b91 (diff) | |
| download | ffmpeg-78d7d8fe9170f38ee0b2ab6f731ff1a61c712db5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Employ FF_ARRAY_ELEMS instead of manually calculating array length.
Fixed invalid access in wavpack decoder on corrupted bitstream.
Fixed invalid writes in wavpack decoder on corrupted bitstreams.
Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
rtpdec_asf: Fix integer underflow that could allow remote code execution
Conflicts:
libavformat/rtpdec_asf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avlanguage.c')
| -rw-r--r-- | libavformat/avlanguage.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c index 525bf07d27..39f2560d94 100644 --- a/libavformat/avlanguage.c +++ b/libavformat/avlanguage.c @@ -20,6 +20,7 @@ #include "avlanguage.h" #include "libavutil/avstring.h" +#include "libavutil/common.h" #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -736,7 +737,7 @@ const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_cod { int i; const LangEntry *entry = NULL; - const int NB_CODESPACES = sizeof(lang_table_counts)/sizeof(*lang_table_counts); + const int NB_CODESPACES = FF_ARRAY_ELEMS(lang_table_counts); if (target_codespace >= NB_CODESPACES) return NULL; |