Browse Source

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hls: Avoid reading outside of the allocated array

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
9c00f9ada6
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavformat/hls.c

+ 2
- 1
libavformat/hls.c View File

@@ -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) {


Loading…
Cancel
Save