History

avcodec/h264_parser: saturate dts a bit

Fixes: signed integer overflow: 0 - -9223372036854775808 cannot be represented in type 'long' Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6112289464123392

Michael Niedermayer committed 3 years ago

Commit 7fedbc71 parent cedb4731 file · +2 −2Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

libavcodec/h264_parser.c+2−2
@@ -641,10 +641,10 @@ static int h264_parse(AVCodecParserContext *s, · 640 unmodified lines
641641 int64_t num = time_base.num * (int64_t)avctx->pkt_timebase.den;
642642 if (s->dts != AV_NOPTS_VALUE) {
643643 // got DTS from the stream, update reference timestamp
644− p->reference_dts = s->dts - av_rescale(s->dts_ref_dts_delta, num, den);
644+ p->reference_dts = av_sat_sub64(s->dts, av_rescale(s->dts_ref_dts_delta, num, den));
645645 } else if (p->reference_dts != AV_NOPTS_VALUE) {
646646 // compute DTS based on reference timestamp
647− s->dts = p->reference_dts + av_rescale(s->dts_ref_dts_delta, num, den);
647+ s->dts = av_sat_add64(p->reference_dts, av_rescale(s->dts_ref_dts_delta, num, den));
648648 }
649649
650650 if (p->reference_dts != AV_NOPTS_VALUE && s->pts == AV_NOPTS_VALUE)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t