OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
149d368
)
vmdaudio: validate block type
author
Justin Ruggles
<justin.ruggles@gmail.com>
Wed, 23 Feb 2011 18:11:05 +0000
(13:11 -0500)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 26 Feb 2011 02:16:02 +0000
(
03:16
+0100)
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
22f893e1c9f9387f0a021f775757130fa48e0180
)
libavcodec/vmdav.c
patch
|
blob
|
history
diff --git
a/libavcodec/vmdav.c
b/libavcodec/vmdav.c
index
a528d91
..
b338da3
100644
(file)
--- a/
libavcodec/vmdav.c
+++ b/
libavcodec/vmdav.c
@@
-518,6
+518,10
@@
static int vmdaudio_decode_frame(AVCodecContext *avctx,
return buf_size;
block_type = buf[6];
+ if (block_type < BLOCK_TYPE_AUDIO || block_type > BLOCK_TYPE_SILENCE) {
+ av_log(avctx, AV_LOG_ERROR, "unknown block type: %d\n", block_type);
+ return AVERROR(EINVAL);
+ }
if (block_type == BLOCK_TYPE_AUDIO) {
/* the chunk contains audio */