Commit c1cdce5d authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/matroskadec: Check av_mallocz() return values

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent ff0c5593
...@@ -2507,6 +2507,8 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska, ...@@ -2507,6 +2507,8 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
pkt = av_mallocz(sizeof(*pkt)); pkt = av_mallocz(sizeof(*pkt));
if (!pkt)
return AVERROR(ENOMEM);
err = av_new_packet(pkt, text_len); err = av_new_packet(pkt, text_len);
if (err < 0) { if (err < 0) {
av_free(pkt); av_free(pkt);
...@@ -2592,6 +2594,8 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, ...@@ -2592,6 +2594,8 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
offset = 8; offset = 8;
pkt = av_mallocz(sizeof(AVPacket)); pkt = av_mallocz(sizeof(AVPacket));
if (!pkt)
return AVERROR(ENOMEM);
/* XXX: prevent data copy... */ /* XXX: prevent data copy... */
if (av_new_packet(pkt, pkt_size + offset) < 0) { if (av_new_packet(pkt, pkt_size + offset) < 0) {
av_free(pkt); av_free(pkt);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment