RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/subtitles: Don't increment packet counter prematurely 

Do it only if the packet has been successfully allocated in
av_new_packet() -- otherwise on error a completely uninitialized packet
would be unreferenced later.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6bd8bcc2ac)
This commit is contained in:
Andreas Rheinhardt 2020-03-21 04:50:20 +01:00
parent 10b1d1d3ca
commit 2765e92731
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/subtitles.c
View File

@ -132,9 +132,10 @@ AVPacket *ff_subtitles_queue_insert(FFDemuxSubtitlesQueue *q,
if (!subs) if (!subs)
return NULL; return NULL;
q->subs = subs; q->subs = subs;
sub = &subs[q->nb_subs++]; sub = &subs[q->nb_subs];
if (av_new_packet(sub, len) < 0) if (av_new_packet(sub, len) < 0)
return NULL; return NULL;
q->nb_subs++;
sub->flags |= AV_PKT_FLAG_KEY; sub->flags |= AV_PKT_FLAG_KEY;
sub->pts = sub->dts = 0; sub->pts = sub->dts = 0;
memcpy(sub->data, event, len); memcpy(sub->data, event, len);