aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-25 00:25:01 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-25 00:26:39 +0100
commitc1cdce5dcb957f6bde0c08905190d905993b61eb (patch)
treeb74c831a40f65d3e90826c0b66cafb1a64eea26b /libavformat/matroskadec.c
parentff0c559329bd3fc8c63215b835ba65791e85a0da (diff)
downloadffmpeg-c1cdce5dcb957f6bde0c08905190d905993b61eb.tar.gz
avformat/matroskadec: Check av_mallocz() return values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 95ec67c1e5..2645797824 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2507,6 +2507,8 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska,
return AVERROR_INVALIDDATA;
pkt = av_mallocz(sizeof(*pkt));
+ if (!pkt)
+ return AVERROR(ENOMEM);
err = av_new_packet(pkt, text_len);
if (err < 0) {
av_free(pkt);
@@ -2592,6 +2594,8 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
offset = 8;
pkt = av_mallocz(sizeof(AVPacket));
+ if (!pkt)
+ return AVERROR(ENOMEM);
/* XXX: prevent data copy... */
if (av_new_packet(pkt, pkt_size + offset) < 0) {
av_free(pkt);