diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 13:58:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 13:58:54 +0200 |
| commit | d6e650d885941282955e4840d4bdd8aa6feb58fd (patch) | |
| tree | 6e829ccacecc7f5ca5669055c54977de6d23c053 | |
| parent | fcfbc58a1cd77f3781a52f7517cdd255664da193 (diff) | |
| parent | 0d61f260010707f3028b818e8b24598e1a83d696 (diff) | |
| download | ffmpeg-d6e650d885941282955e4840d4bdd8aa6feb58fd.tar.gz | |
Merge commit '0d61f260010707f3028b818e8b24598e1a83d696'
* commit '0d61f260010707f3028b818e8b24598e1a83d696':
zmbvdec: Check the buffer size for uncompressed data
Conflicts:
libavcodec/zmbv.c
See: 44c23aa1b85d195db6647d24e3b1d3de051790db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/zmbv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 905c4ccbe6..89857af45d 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -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); |