aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-15 01:35:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-15 01:35:52 +0200
commit59c122b3b0a00808e3c4f534927755d89e7baa62 (patch)
tree6b1e55eefb54da3cd8803dd0acac1b77b8837c50
parent4b7c52346a2e3cb2d47f8af0b2f036fb9317f502 (diff)
downloadffmpeg-59c122b3b0a00808e3c4f534927755d89e7baa62.tar.gz
matroskadec: add assert on lack of overflow in pkt_size+offset
currently a overflow there should be impossible but future changes to the code could easily introduce a bug that no longer limits the 2 values sufficiently so better protect it via av_assert. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/matroskadec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 74df0764b2..aaeff210df 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2053,6 +2053,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
offset = matroska_decode_buffer(&pkt_data,&pkt_size, track);
if (offset < 0)
continue;
+ av_assert0(offset + pkt_size >= pkt_size);
}
pkt = av_mallocz(sizeof(AVPacket));