aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2019-08-17 11:40:11 +0200
committerMarton Balint <cus@passwd.hu>2019-08-22 21:38:41 +0200
commit6ee40dcb64c91cc9a4cb988408d8ed159dacdcfe (patch)
tree51e526c770adf6c57438705e8fd2d6224a0cfc90
parent493438fafc5c43b7b7c62bf0c21b7cc884034ce9 (diff)
downloadffmpeg-6ee40dcb64c91cc9a4cb988408d8ed159dacdcfe.tar.gz
avformat/mxfdec: do not ignore bad size errors
The return value was unintentionally lost after 00a2652df3bf25a27d174cc67ed508b5317cb115. Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--libavformat/mxfdec.c4
1 files 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)