[FFmpeg-cvslog] avformat/mxfdec: do not ignore bad size errors

Marton Balint git at videolan.org
Thu Aug 22 23:41:43 EEST 2019


ffmpeg | branch: release/4.2 | Marton Balint <cus at passwd.hu> | Sat Aug 17 11:40:11 2019 +0200| [370c346d5dfd28d548b7ce6560e1448ce796b7fe] | committer: Marton Balint

avformat/mxfdec: do not ignore bad size errors

The return value was unintentionally lost after
00a2652df3bf25a27d174cc67ed508b5317cb115.

Signed-off-by: Marton Balint <cus at passwd.hu>
(cherry picked from commit 6ee40dcb64c91cc9a4cb988408d8ed159dacdcfe)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=370c346d5dfd28d548b7ce6560e1448ce796b7fe
---

 libavformat/mxfdec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index bb72fb9841..397f820b3f 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -3508,8 +3508,8 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
                 } else {
                     if ((size = next_ofs - pos) <= 0) {
                         av_log(s, AV_LOG_ERROR, "bad size: %"PRId64"\n", size);
-                        ret = AVERROR_INVALIDDATA;
-                        goto skip;
+                        mxf->current_klv_data = (KLVPacket){{0}};
+                        return AVERROR_INVALIDDATA;
                     }
                     // We must not overread, because the next edit unit might be in another KLV
                     if (size > max_data_size)



More information about the ffmpeg-cvslog mailing list