From 0bd433a916cd8d98fce47742fbf6d0f90ec941c4 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uoti.urpala.pp1.inet.fi>
Date: Sun, 24 Apr 2011 07:21:30 +0300
Subject: [PATCH] asfdec: fix assert failure on invalid files
Add an extra size validity check in asf_read_frame_header(). Without
this asf->packet_size_left may become negative, which triggers an
assertion failure later.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
---
libavformat/asfdec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 637ceed34ae..77c84490a06 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -864,6 +864,10 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
}
//printf("Fragsize %d\n", asf->packet_frag_size);
} else {
+ if (rsize > asf->packet_size_left) {
+ av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n");
+ return -1;
+ }
asf->packet_frag_size = asf->packet_size_left - rsize;
//printf("Using rest %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize);
}
--
GitLab