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

dds: validate source buffer size before copying

Browse Source 
If it is too small av_image_copy_plane segfaults.

Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 1675809d2d)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2015-11-11 00:05:02 +01:00
parent df31acda64
commit a8513826dd
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dds.c
View File

@@ -666,6 +666,12 @@ static int dds_decode(AVCodecContext *avctx, void *data,
frame->palette_has_changed = 1; 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], av_image_copy_plane(frame->data[0], frame->linesize[0],
gbc->buffer, linesize, gbc->buffer, linesize,
linesize, frame->height); linesize, frame->height);