Browse Source

rm: prevent infinite loops for index parsing.

Specifically, prevent jumping back in the file for the next index, since
this can lead to infinite loops where we jump between indexes referring
to each other, and don't read indexes that don't fit in the file.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit aac07a7a4c)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
tags/n0.8.11
Ronald S. Bultje Reinhard Tartler 14 years ago
parent
commit
811989e910
1 changed files with 17 additions and 3 deletions
  1. +17
    -3
      libavformat/rmdec.c

+ 17
- 3
libavformat/rmdec.c View File

@@ -350,8 +350,19 @@ static int rm_read_index(AVFormatContext *s)
st = s->streams[n];
break;
}
if (n == s->nb_streams)
if (n == s->nb_streams) {
av_log(s, AV_LOG_ERROR,
"Invalid stream index %d for index at pos %"PRId64"\n",
str_id, avio_tell(pb));
goto skip;
} else if ((avio_size(pb) - avio_tell(pb)) / 14 < n_pkts) {
av_log(s, AV_LOG_ERROR,
"Nr. of packets in packet index for stream index %d "
"exceeds filesize (%"PRId64" at %"PRId64" = %d)\n",
str_id, avio_size(pb), avio_tell(pb),
(avio_size(pb) - avio_tell(pb)) / 14);
goto skip;
}

for (n = 0; n < n_pkts; n++) {
avio_skip(pb, 2);
@@ -363,9 +374,12 @@ static int rm_read_index(AVFormatContext *s)
}

skip:
if (next_off && avio_tell(pb) != next_off &&
avio_seek(pb, next_off, SEEK_SET) < 0)
if (next_off && avio_tell(pb) < next_off &&
avio_seek(pb, next_off, SEEK_SET) < 0) {
av_log(s, AV_LOG_ERROR,
"Non-linear index detected, not supported\n");
return -1;
}
} while (next_off);

return 0;


Loading…
Cancel
Save