diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 10:07:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 10:10:14 +0200 |
| commit | 7ec7d626a12164ef4195c57f5a016c9e0e26f2f5 (patch) | |
| tree | 052044ebf8d501e33a3591430aac8b96f77978f9 | |
| parent | 640a36a05c4d9d371086c22a158fb3d314a71538 (diff) | |
| parent | aae159a7cc4df7d0521901022b778c9da251c24e (diff) | |
| download | ffmpeg-7ec7d626a12164ef4195c57f5a016c9e0e26f2f5.tar.gz | |
Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'
* commit 'aae159a7cc4df7d0521901022b778c9da251c24e':
nuv: Do not ignore lzo decompression failures
Conflicts:
libavcodec/nuv.c
tests/ref/fate/nuv-rtjpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/nuv.c | 4 | ||||
| -rw-r--r-- | tests/ref/fate/nuv-rtjpeg | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index edf777ed3c..3888c0c550 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -208,8 +208,10 @@ retry: buf_size -= 12; if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) { int outlen = c->decomp_size - AV_LZO_OUTPUT_PADDING, inlen = buf_size; - if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) + if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) { av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); + return AVERROR_INVALIDDATA; + } buf = c->decomp_buf; buf_size = c->decomp_size - AV_LZO_OUTPUT_PADDING - outlen; } diff --git a/tests/ref/fate/nuv-rtjpeg b/tests/ref/fate/nuv-rtjpeg index 8838fbb646..96ead33cbd 100644 --- a/tests/ref/fate/nuv-rtjpeg +++ b/tests/ref/fate/nuv-rtjpeg @@ -7,4 +7,3 @@ 0, 9, 9, 1, 460800, 0x4e091ee2 0, 10, 10, 1, 460800, 0x2ea88828 0, 11, 11, 1, 460800, 0x4b7f4df0 -0, 12, 12, 1, 460800, 0xa57f20d0 |