summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2012-04-29 17:55:51 -0700
committerLuca Barbato <lu_zero@gentoo.org>2012-04-29 20:22:09 -0700
commit0ca4642ec520e315692c4a8b8a98ab390bddfad2 (patch)
treeb03c4615a2bcfdaee7699aa9a26dfd3dd20b9e19
parent721af294d9b7ba5df9ffe52b83254654c3d55f16 (diff)
mkv: mark corrupted packets and return them
Do return error if memory allocation or I/O fails.
-rw-r--r--libavformat/matroskadec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 5688658055..3b78ae3972 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2069,6 +2069,11 @@ static int matroska_read_packet(AVFormatContext *s, AVPacket *pkt)
ret = matroska_parse_cluster(matroska);
}
+ if (ret == AVERROR_INVALIDDATA) {
+ pkt->flags |= AV_PKT_FLAG_CORRUPT;
+ return 0;
+ }
+
return ret;
}