avformat/mov: Use 64bit in intermediate for current_dts

Fixes: CID1500304 Unintentional integer overflow
Fixes: CID1500318 Unintentional integer overflow

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 0c977d37aa)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
release/6.1
Michael Niedermayer 10 months ago
parent d081214a70
commit 0df8b97e09
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
  1. 4
      libavformat/mov.c

@ -3212,12 +3212,12 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
corrected_dts += sample_duration * sample_count;
}
current_dts += sc->stts_data[i].duration * sample_count;
current_dts += sc->stts_data[i].duration * (int64_t)sample_count;
if (current_dts > corrected_dts) {
int64_t drift = (current_dts - corrected_dts)/FFMAX(sample_count, 1);
uint32_t correction = (sc->stts_data[i].duration > drift) ? drift : sc->stts_data[i].duration - 1;
current_dts -= correction * sample_count;
current_dts -= correction * (uint64_t)sample_count;
sc->stts_data[i].duration -= correction;
}

Loading…
Cancel
Save