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:
f618cb1
)
avformat/psxstr: zero packet to prevent uninitialized data to leak through to the...
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Dec 2013 03:31:52 +0000
(
04:31
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Dec 2013 03:32:50 +0000
(
04:32
+0100)
Fixes: msan_uninit-mem_7f150abf2e84_4817_descent-partial.str
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/psxstr.c
patch
|
blob
|
history
diff --git
a/libavformat/psxstr.c
b/libavformat/psxstr.c
index
3409d6a
..
5efcadf
100644
(file)
--- a/
libavformat/psxstr.c
+++ b/
libavformat/psxstr.c
@@
-221,6
+221,7
@@
static int str_read_packet(AVFormatContext *s,
av_free_packet(pkt);
if (av_new_packet(pkt, sector_count*VIDEO_DATA_CHUNK_SIZE))
return AVERROR(EIO);
+ memset(pkt->data, 0, sector_count*VIDEO_DATA_CHUNK_SIZE);
pkt->pos= avio_tell(pb) - RAW_CD_SECTOR_SIZE;
pkt->stream_index =