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

pictordec: pass correct context to avpriv_request_sample

Browse Source 
Fixes invalid reads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry-picked from commit fe9bb61f9a16be19ad91875632c39e44b7a99a8a)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Conflicts:
	libavcodec/pictordec.c
This commit is contained in:
Anton Khirnov 2013-08-24 21:30:46 +02:00 committed by Luca Barbato
parent b8ba48c725
commit 8297853917
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/pictordec.c
View File

@ -121,7 +121,7 @@ static int decode_frame(AVCodecContext *avctx,
s->nb_planes = (tmp >> 4) + 1;
bpp = bits_per_plane * s->nb_planes;
if (bits_per_plane > 8 || bpp < 1 || bpp > 32) {
av_log_ask_for_sample(s, "unsupported bit depth\n");
av_log_ask_for_sample(avctx, "unsupported bit depth\n");
return AVERROR_INVALIDDATA;
}
@ -233,7 +233,7 @@ static int decode_frame(AVCodecContext *avctx,
}
}
} else {
av_log_ask_for_sample(s, "uncompressed image\n");
av_log_ask_for_sample(avctx, "uncompressed image\n");
return avpkt->size;
}
finish: