summaryrefslogtreecommitdiff
path: root/libavformat/subtitles.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-04 17:10:38 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-10-06 20:00:59 +0200
commit81b53913bbb97234e22187d1122948c351a3466d (patch)
treeb40bfb35ed120f28cf228123c8847a8f476c9797 /libavformat/subtitles.c
parent22bec0d33f4231487547581a1f77e2e8e6eade88 (diff)
avformat/subtitles: Check nb_subs in ff_subtitles_queue_finalize()
Fixes: null pointer dereference Fixes: 17828/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5645915116797952 Fixes: Ticket8147 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/subtitles.c')
-rw-r--r--libavformat/subtitles.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c
index 659c99d1cf..a3240d88a1 100644
--- a/libavformat/subtitles.c
+++ b/libavformat/subtitles.c
@@ -194,6 +194,9 @@ void ff_subtitles_queue_finalize(void *log_ctx, FFDemuxSubtitlesQueue *q)
{
int i;
+ if (!q->nb_subs)
+ return;
+
qsort(q->subs, q->nb_subs, sizeof(*q->subs),
q->sort == SUB_SORT_TS_POS ? cmp_pkt_sub_ts_pos
: cmp_pkt_sub_pos_ts);