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

Merge commit '4d122b01e4ce539269ee2df193b061772c7374f6'

Browse Source 
* commit '4d122b01e4ce539269ee2df193b061772c7374f6':
  movenc: Check for allocation failures in mov_create_chapter_track

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-27 12:26:19 +02:00
parent 535d9a9386 4d122b01e4
commit 0bd15938ec
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/movenc.c
View File

@@ -3393,6 +3393,8 @@ static int mov_create_chapter_track(AVFormatContext *s, int tracknum)
track->tag = MKTAG('t','e','x','t'); track->tag = MKTAG('t','e','x','t');
track->timescale = MOV_TIMESCALE; track->timescale = MOV_TIMESCALE;
track->enc = avcodec_alloc_context3(NULL); track->enc = avcodec_alloc_context3(NULL);
if (!track->enc)
return AVERROR(ENOMEM);
track->enc->codec_type = AVMEDIA_TYPE_SUBTITLE; track->enc->codec_type = AVMEDIA_TYPE_SUBTITLE;
#if 0 #if 0
// These properties are required to make QT recognize the chapter track // These properties are required to make QT recognize the chapter track
@@ -3460,6 +3462,8 @@ static int mov_create_chapter_track(AVFormatContext *s, int tracknum)
len = strlen(t->value); len = strlen(t->value);
pkt.size = len + 2; pkt.size = len + 2;
pkt.data = av_malloc(pkt.size); pkt.data = av_malloc(pkt.size);
if (!pkt.data)
return AVERROR(ENOMEM);
AV_WB16(pkt.data, len); AV_WB16(pkt.data, len);
memcpy(pkt.data + 2, t->value, len); memcpy(pkt.data + 2, t->value, len);
ff_mov_write_packet(s, &pkt); ff_mov_write_packet(s, &pkt);