]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/dirac_parser: do not offset AV_NOPTS_OFFSET
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 23 Oct 2020 18:29:50 +0000 (20:29 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 26 Oct 2020 08:10:49 +0000 (09:10 +0100)
Fixes: signed integer overflow: -9223372036854775807 - 48000 cannot be represented in type 'long long'
Fixes: 26521/clusterfuzz-testcase-minimized-ffmpeg_dem_DIRAC_fuzzer-5635536506847232
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/dirac_parser.c

index fbc7414c791ea95d50dc0f6f8d1175681dae8e2a..8e68b4a9dab5bb0bd9301399705b6200c48273ce 100644 (file)
@@ -215,7 +215,7 @@ static int dirac_combine_frame(AVCodecParserContext *s, AVCodecContext *avctx,
             int64_t pts = AV_RB32(cur_pu + 13);
             if (s->last_pts == 0 && s->last_dts == 0)
                 s->dts = pts - 1;
-            else
+            else if (s->last_dts != AV_NOPTS_VALUE)
                 s->dts = s->last_dts + 1;
             s->pts = pts;
             if (!avctx->has_b_frames && (cur_pu[4] & 0x03))