mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '0989d3ad1fbd7509815208b0a5792918492d2a68'
* commit '0989d3ad1fbd7509815208b0a5792918492d2a68': asfdec: convert condition for the replicated data reading to be safer Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
commit
80a37fc3e1
|
@ -1133,7 +1133,7 @@ static int asf_read_multiple_payload(AVFormatContext *s, AVPacket *pkt,
|
||||||
} else
|
} else
|
||||||
avio_skip(pb, 4); // reading of media object size is already done
|
avio_skip(pb, 4); // reading of media object size is already done
|
||||||
asf_pkt->dts = avio_rl32(pb); // read presentation time
|
asf_pkt->dts = avio_rl32(pb); // read presentation time
|
||||||
if (asf->rep_data_len && ((asf->rep_data_len - 8) > 0))
|
if (asf->rep_data_len && (asf->rep_data_len >= 8))
|
||||||
avio_skip(pb, asf->rep_data_len - 8); // skip replicated data
|
avio_skip(pb, asf->rep_data_len - 8); // skip replicated data
|
||||||
}
|
}
|
||||||
pay_len = avio_rl16(pb); // payload length should be WORD
|
pay_len = avio_rl16(pb); // payload length should be WORD
|
||||||
|
@ -1183,7 +1183,7 @@ static int asf_read_single_payload(AVFormatContext *s, AVPacket *pkt,
|
||||||
} else
|
} else
|
||||||
avio_skip(pb, 4); // skip media object size
|
avio_skip(pb, 4); // skip media object size
|
||||||
asf_pkt->dts = avio_rl32(pb); // read presentation time
|
asf_pkt->dts = avio_rl32(pb); // read presentation time
|
||||||
if ((asf->rep_data_len - 8) > 0)
|
if (asf->rep_data_len >= 8)
|
||||||
avio_skip(pb, asf->rep_data_len - 8); // skip replicated data
|
avio_skip(pb, asf->rep_data_len - 8); // skip replicated data
|
||||||
offset = avio_tell(pb);
|
offset = avio_tell(pb);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue