From c1cdce5dcb957f6bde0c08905190d905993b61eb Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 25 Jan 2015 00:25:01 +0100
Subject: [PATCH] avformat/matroskadec: Check av_mallocz() return values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavformat/matroskadec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 95ec67c1e50..26457978242 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);
--
GitLab