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:
e838c98
)
avformat/oggparsetheora: zero extradata padding area
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Dec 2013 18:21:02 +0000
(19:21 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Dec 2013 18:21:48 +0000
(19:21 +0100)
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f66fa0ac09d_9197_theora_a4_v6_k250_s0.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/oggparsetheora.c
patch
|
blob
|
history
diff --git
a/libavformat/oggparsetheora.c
b/libavformat/oggparsetheora.c
index
6458b97
..
59df17e
100644
(file)
--- a/
libavformat/oggparsetheora.c
+++ b/
libavformat/oggparsetheora.c
@@
-131,6
+131,8
@@
static int theora_header(AVFormatContext *s, int idx)
st->codec->extradata_size = 0;
return err;
}
+ memset(st->codec->extradata + cds, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
cdp = st->codec->extradata + st->codec->extradata_size;
*cdp++ = os->psize >> 8;
*cdp++ = os->psize & 0xff;