generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iff: avoid out of array reads, due to too many planes.

Browse Source 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-09 17:47:51 +01:00
parent 7989f7e0b5
commit fb6a72cde5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/iff.c
View File

@ -371,6 +371,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int plane) static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int plane)
{ {
const uint64_t *lut = plane8_lut[plane]; const uint64_t *lut = plane8_lut[plane];
if (plane >= 8) {
av_log(0, AV_LOG_WARNING, "Ignoring extra planes beyond 8\n");
return;
}
do { do {
uint64_t v = AV_RN64A(dst) | lut[*buf++]; uint64_t v = AV_RN64A(dst) | lut[*buf++];
AV_WN64A(dst, v); AV_WN64A(dst, v);