avformat/psxstr: zero packet to prevent uninitialized data to leak through to the...
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Dec 2013 03:31:52 +0000 (04:31 +0100)
committerMichael 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

index 3409d6a..5efcadf 100644 (file)
@@ -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 =