Commit 9c00f9ad authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hls: Avoid reading outside of the allocated array
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9440e470 56c23370
...@@ -724,7 +724,8 @@ start: ...@@ -724,7 +724,8 @@ start:
/* Check if this stream still is on an earlier segment number, or /* Check if this stream still is on an earlier segment number, or
* has the packet with the lowest dts */ * has the packet with the lowest dts */
if (var->pkt.data) { if (var->pkt.data) {
struct variant *minvar = c->variants[minvariant]; struct variant *minvar = minvariant < 0 ?
NULL : c->variants[minvariant];
if (minvariant < 0 || var->cur_seq_no < minvar->cur_seq_no) { if (minvariant < 0 || var->cur_seq_no < minvar->cur_seq_no) {
minvariant = i; minvariant = i;
} else if (var->cur_seq_no == minvar->cur_seq_no) { } else if (var->cur_seq_no == minvar->cur_seq_no) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment