mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '0d61f260010707f3028b818e8b24598e1a83d696'
* commit '0d61f260010707f3028b818e8b24598e1a83d696':
zmbvdec: Check the buffer size for uncompressed data
Conflicts:
libavcodec/zmbv.c
See: 44c23aa1b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
d6e650d885
|
@ -510,7 +510,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
|
|||
|
||||
if (c->comp == 0) { //Uncompressed data
|
||||
if (c->decomp_size < len) {
|
||||
av_log(avctx, AV_LOG_ERROR, "decomp buffer too small\n");
|
||||
av_log(avctx, AV_LOG_ERROR, "Buffer too small\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
memcpy(c->decomp_buf, buf, len);
|
||||
|
|
Loading…
Reference in New Issue