[FFmpeg-devel] [FFmpeg-devel 2/2] avformat/mov: return correct value in mov_read_cmov

Pan Bian bianpan2016 at 163.com
Mon Nov 27 05:13:05 EET 2017


On some failure paths, the error code is not correctly set.

Signed-off-by: Pan Bian <bianpan2016 at 163.com>
---
 libavformat/mov.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index d25071b..bbf550f 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4895,6 +4895,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)
-- 
1.9.1




More information about the ffmpeg-devel mailing list