aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-03-21 04:50:20 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2020-03-22 13:00:19 +0100
commit6bd8bcc2ac4c64577d964552317989e61db794d8 (patch)
tree0bde5d34934c6c4fff498051fb53c63992c1e50f
parent5acef1206144554a48f699b421e8d739e752d8ab (diff)
downloadffmpeg-6bd8bcc2ac4c64577d964552317989e61db794d8.tar.gz
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>
-rw-r--r--libavformat/subtitles.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c
index 172da5de2b..ad7f68938e 100644
--- a/libavformat/subtitles.c
+++ b/libavformat/subtitles.c
@@ -132,9 +132,10 @@ AVPacket *ff_subtitles_queue_insert(FFDemuxSubtitlesQueue *q,
if (!subs)
return NULL;
q->subs = subs;
- sub = &subs[q->nb_subs++];
+ sub = &subs[q->nb_subs];
if (av_new_packet(sub, len) < 0)
return NULL;
+ q->nb_subs++;
sub->flags |= AV_PKT_FLAG_KEY;
sub->pts = sub->dts = 0;
memcpy(sub->data, event, len);