generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/matroskadec: Check av_mallocz() return values

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-25 00:25:01 +01:00
parent ff0c559329
commit c1cdce5dcb
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/matroskadec.c
View File

@ -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,
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);