aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarton Balint2019-08-17 11:40:11 +0200
committerMarton Balint2019-08-22 22:23:03 +0200
commit370c346d5dfd28d548b7ce6560e1448ce796b7fe (patch)
treedf9fd6e426742ddc5844a3a7571ab6ad2fc37e38
parent299e0dff1fbc3594eca9e67e18a28331892c23fb (diff)
avformat/mxfdec: do not ignore bad size errors
The return value was unintentionally lost after 00a2652df3bf25a27d174cc67ed508b5317cb115. Signed-off-by: Marton Balint <cus@passwd.hu> (cherry picked from commit 6ee40dcb64c91cc9a4cb988408d8ed159dacdcfe)
-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)