Browse Source

r3d: Add more input value validation

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.1
Martin Storsjö 12 years ago
parent
commit
d8798276b6
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      libavformat/r3d.c

+ 5
- 1
libavformat/r3d.c View File

@@ -85,7 +85,7 @@ static int r3d_read_red1(AVFormatContext *s)


framerate.num = avio_rb16(s->pb); framerate.num = avio_rb16(s->pb);
framerate.den = avio_rb16(s->pb); framerate.den = avio_rb16(s->pb);
if (framerate.num && framerate.den) {
if (framerate.num > 0 && framerate.den > 0) {
st->avg_frame_rate = framerate; st->avg_frame_rate = framerate;
} }


@@ -281,6 +281,10 @@ static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom)
dts = avio_rb32(s->pb); dts = avio_rb32(s->pb);


st->codec->sample_rate = avio_rb32(s->pb); st->codec->sample_rate = avio_rb32(s->pb);
if (st->codec->sample_rate <= 0) {
av_log(s, AV_LOG_ERROR, "Bad sample rate\n");
return AVERROR_INVALIDDATA;
}


samples = avio_rb32(s->pb); samples = avio_rb32(s->pb);




Loading…
Cancel
Save