summaryrefslogtreecommitdiff
path: root/libavcodec/nuv.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-08-12 00:16:12 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-08-13 13:09:22 +0200
commitaae159a7cc4df7d0521901022b778c9da251c24e (patch)
tree7d201911bef235e427c3e2e268961ec7dd2e8a25 /libavcodec/nuv.c
parent46dee21a3238a5d9dfeeb1108dbad0beaa677035 (diff)
downloadffmpeg-aae159a7cc4df7d0521901022b778c9da251c24e.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
Diffstat (limited to 'libavcodec/nuv.c')
-rw-r--r--libavcodec/nuv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 4d5063fad7..269bf8bfbb 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -200,8 +200,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
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;
}