ffmpeg | branch: master | Pan Bian <bianpan2...@163.com> | Mon Nov 27 11:13:05 2017 +0800| [f63450c8e4c9c1f7af07869c4a25543e4e4d2626] | committer: Michael Niedermayer
avformat/mov: return correct value in mov_read_cmov On some failure paths, the error code is not correctly set. Signed-off-by: Pan Bian <bianpan2...@163.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f63450c8e4c9c1f7af07869c4a25543e4e4d2626 --- libavformat/mov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 230a7f95d0..c9018592e0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4894,6 +4894,7 @@ static int mov_read_cmov(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (ret < 0) goto free_and_return; + ret = AVERROR_INVALIDDATA; if (uncompress (moov_data, (uLongf *) &moov_len, (const Bytef *)cmov_data, cmov_len) != Z_OK) goto free_and_return; if (ffio_init_context(&ctx, moov_data, moov_len, 0, NULL, NULL, NULL, NULL) != 0) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
