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:
0e0f6bd
)
avcodec/bink: use av_mallocz for data
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Dec 2013 15:52:37 +0000
(16:52 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Dec 2013 15:53:32 +0000
(16:53 +0100)
Fixes use of uninitialized memory
Fixes msan_uninit-mem_7fe8a5fd759d_2838_SPECTRE.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bink.c
patch
|
blob
|
history
diff --git
a/libavcodec/bink.c
b/libavcodec/bink.c
index
8f8a036
..
f23542f
100644
(file)
--- a/
libavcodec/bink.c
+++ b/
libavcodec/bink.c
@@
-185,7
+185,7
@@
static av_cold int init_bundles(BinkContext *c)
blocks = bw * bh;
for (i = 0; i < BINKB_NB_SRC; i++) {
- c->bundle[i].data = av_malloc(blocks * 64);
+ c->bundle[i].data = av_malloc
z
(blocks * 64);
if (!c->bundle[i].data)
return AVERROR(ENOMEM);
c->bundle[i].data_end = c->bundle[i].data + blocks * 64;