[FFmpeg-cvslog] asfdec: convert condition for the replicated data reading to be safer
Alexandra Hájková
git at videolan.org
Sun Jul 19 11:38:34 CEST 2015
ffmpeg | branch: master | Alexandra Hájková <alexandra.khirnova at gmail.com> | Fri Jul 17 14:17:05 2015 +0200| [0989d3ad1fbd7509815208b0a5792918492d2a68] | committer: Anton Khirnov
asfdec: convert condition for the replicated data reading to be safer
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0989d3ad1fbd7509815208b0a5792918492d2a68
---
libavformat/asfdec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 371d480..bb08357 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1133,7 +1133,7 @@ static int asf_read_multiple_payload(AVFormatContext *s, AVPacket *pkt,
} else
avio_skip(pb, 4); // reading of media object size is already done
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
}
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
avio_skip(pb, 4); // skip media object size
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
offset = avio_tell(pb);
More information about the ffmpeg-cvslog
mailing list