diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-08-12 00:16:12 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-10-16 23:05:51 +0200 |
| commit | cda26ab21eb574e7e39b0a329941d87754b8c477 (patch) | |
| tree | 362525aeb0d0605a3909b195e33294e96dc707e0 /libavcodec | |
| parent | 3cc05e0d9d24d0d6f2fdb1d49ec6b6d298816dae (diff) | |
| download | ffmpeg-cda26ab21eb574e7e39b0a329941d87754b8c477.tar.gz | |
nuv: Do not ignore lzo decompression failures
Update the fate reference since the last broken frame is not decoded
anymore.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit aae159a7cc4df7d0521901022b778c9da251c24e)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavcodec/nuv.c
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/nuv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 519b550bcd..b4e21bf0dd 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -177,8 +177,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, buf_size -= 12; if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) { int outlen = c->decomp_size, 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; } |