virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/pngdec: check av_image_get_linesize return value

Browse Source 
Fixes CID 1257012

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Benoit Fouet
2014-12-08 03:16:46 +01:00
committed by Michael Niedermayer
parent dceb8b1252
commit 4fa2758c79
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/pngdec.c
View File

@@ -872,6 +872,9 @@ static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s,
s->previous_picture.f->data[0] : s->last_picture.f->data[0]; s->previous_picture.f->data[0] : s->last_picture.f->data[0];
int ls = FFMIN(av_image_get_linesize(p->format, s->width, 0), s->width * s->bpp); int ls = FFMIN(av_image_get_linesize(p->format, s->width, 0), s->width * s->bpp);
if (ls < 0)
return ls;
if (s->blend_op == APNG_BLEND_OP_OVER && if (s->blend_op == APNG_BLEND_OP_OVER &&
avctx->pix_fmt != AV_PIX_FMT_RGBA && avctx->pix_fmt != AV_PIX_FMT_ARGB) { avctx->pix_fmt != AV_PIX_FMT_RGBA && avctx->pix_fmt != AV_PIX_FMT_ARGB) {
avpriv_request_sample(avctx, "Blending with pixel format %s", avpriv_request_sample(avctx, "Blending with pixel format %s",