aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-05-07 08:25:24 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-05-10 06:17:39 +0200
commit3417379d5e85c026e6eda447ea7fcd3ccccead4a (patch)
treeaf6c93947a060103a311c509220f5589e7d685e0
parent0a58fdfd3e7a063cc652ddd4510ae064dcdc9de1 (diff)
downloadffmpeg-3417379d5e85c026e6eda447ea7fcd3ccccead4a.tar.gz
avformat/dhav: Don't truncate return value of avio_skip()
Fixes demuxing files bigger than INT_MAX. Reported-by: jenster Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavformat/dhav.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/dhav.c b/libavformat/dhav.c
index 60aab8cabd..9d26efe8fc 100644
--- a/libavformat/dhav.c
+++ b/libavformat/dhav.c
@@ -78,10 +78,11 @@ static const uint32_t sample_rates[] = {
static int parse_ext(AVFormatContext *s, int length)
{
DHAVContext *dhav = s->priv_data;
- int index, ret = 0;
+ int64_t ret = 0;
while (length > 0) {
int type = avio_r8(s->pb);
+ int index;
switch (type) {
case 0x80:
@@ -168,8 +169,7 @@ static int read_chunk(AVFormatContext *s)
{
DHAVContext *dhav = s->priv_data;
int frame_length, ext_length;
- int64_t start, end;
- int ret;
+ int64_t start, end, ret;
if (avio_feof(s->pb))
return AVERROR_EOF;