summaryrefslogtreecommitdiff
path: root/libavformat/flac_picture.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc'Michael Niedermayer2014-10-251-4/+5
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc': flac_picture: prevent a possible out of bound write This is only partly merged, the condition this checks for is impossible to be true as it would imply avio_read() to read more than the size passed to it See: 731f7eaaade4c0cf91f8008cc30c0342caa64df1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac_picture: prevent a possible out of bound writeVittorio Giovara2014-10-241-5/+5
| | | | | | | | | | | | | | | | At "mimetype[len] = 0;" mimetype is a 64 element array and len might be equal to or greater than that. CC: libav-stable@libav.org Bug-Id: CID 1061055
* | avformat/flac_picture: clear padding areaMichael Niedermayer2014-01-311-0/+1
| | | | | | | | | | | | | | | | aviod use of uninitialized memory Fixes: asan_heap-oob_1487fa4_4706_cov_364534849_cover_art.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flac_picture: allocate buffer padding for pictureMichael Niedermayer2014-01-311-1/+1
| | | | | | | | | | | | | | Fixes: heap array overread Fixes: asan_heap-oob_14876d9_4706_cov_815472558_cover_art.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'Michael Niedermayer2013-10-131-12/+11
|/ | | | | | | | | | | | * commit '601d6228c4811d8971a2412a759e1a4ab775ebe8': flac: move picture parsing code in a separate file Conflicts: libavformat/Makefile libavformat/flacdec.c See: 1e5bbbfcf303ec3db0c7db30b85855e2e5358aec Merged-by: Michael Niedermayer <michaelni@gmx.at>
* flac: move picture parsing code in a separate fileJames Almer2013-10-121-0/+152
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>