Module: libav Branch: master Commit: e6459c655e110cd9acb5d0658d89c415eaca847b
Author: Andreas Cadhalpun <[email protected]> Committer: Vittorio Giovara <[email protected]> Date: Wed Nov 11 01:14:57 2015 +0100 dds: validate source buffer size before copying If it is too small av_image_copy_plane segfaults. Signed-off-by: Andreas Cadhalpun <[email protected]> --- libavcodec/dds.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/dds.c b/libavcodec/dds.c index 04b1dd2..0f045d6 100644 --- a/libavcodec/dds.c +++ b/libavcodec/dds.c @@ -668,6 +668,12 @@ static int dds_decode(AVCodecContext *avctx, void *data, frame->palette_has_changed = 1; } + if (bytestream2_get_bytes_left(gbc) < frame->height * linesize) { + av_log(avctx, AV_LOG_ERROR, "Buffer is too small (%d < %d).\n", + bytestream2_get_bytes_left(gbc), frame->height * linesize); + return AVERROR_INVALIDDATA; + } + av_image_copy_plane(frame->data[0], frame->linesize[0], gbc->buffer, linesize, linesize, frame->height); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
