From patchwork Sun Mar 20 23:30:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34873 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1218737nkc; Sun, 20 Mar 2022 16:31:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqPy82eX+qo3Wn41ocBLUAOy7+X25z8VmX8hTU/ZlAcVTDCqGlGOUYxkts077mPS7TIJjg X-Received: by 2002:a17:907:8c87:b0:6df:fc27:c82c with SMTP id td7-20020a1709078c8700b006dffc27c82cmr3769947ejc.378.1647819097124; Sun, 20 Mar 2022 16:31:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647819097; cv=none; d=google.com; s=arc-20160816; b=v6v+DzQa890JwzxhS2dBpH3Ych+/M4OBUev3C8xUmMrNwxcl4AlynHYd8sSh7tDQ0I XsZ52A8B5k9Z+Yj7N+JuSUgOcMP8psAPfAIEfTx0WcrL2YftQS2AaJrhtlvj/Orql1QX Olf/ytOLVx5a3VAShBUQOcVGUG9NCuM1Bmhy6avfTnDXvQVENrY6wSKyrtDcuZXjmXdd tQRfeJSDbgZPYzibTK2o4VskTeuXIiRMYWcX9+GAsuPoEdvfwdUooiJXRbHk3VMg14YA 7NsVrFqMj9pp3eBNbP5t2roZEWbrqhEK0Cz7puMcohwPxhtQxoVsNdvdchXojdgJ8TwF DFVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=m+gA9azDDkUsdVb4WFYAjZhxY5XYLYO6Fxm68uoJ2F8=; b=RSXsmltoC8x4ZAG7q6jfEofgZ2cD6gJ28bKfir7a93d0BUo+A2YV/GnkPkTayXoiX6 hGssPEoAcN5SGfaBL9+uD2cknsCISev/5nlptaFpdQPtYXfFt0y47dRqjV/56bsKG0yX WBiVVB2WFp7AYbOBLddZepIarK5jAN/Oc+dAYIGvfzVrtpOUI0Hc00Qba5V5zfz8sDV7 wN+gguqLKEgTSSw8cg1eA4jDg2VlVmO3tIXG9RP76WSXlFUezZ4nRIh5jRDFUnpcTTP4 vIKWzPK0BkJYX7J7j6535OEonKp+qZD0Nu/s/fXl2mgh+CbtB3885FgJj27xBsKecRoF pgkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i23-20020a508717000000b0041900b5abe6si7900959edb.472.2022.03.20.16.31.36; Sun, 20 Mar 2022 16:31:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4434368B195; Mon, 21 Mar 2022 01:31:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EE0168B0F6 for ; Mon, 21 Mar 2022 01:31:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nW50y-00FjuP-17 for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 00:31:12 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W50xnGLiDSgGFW50ynIvZ9; Mon, 21 Mar 2022 00:31:12 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id W50inPQXROPqFW50inIvAy; Mon, 21 Mar 2022 00:30:57 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=6237b93f a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=Wn7x23jaqpC7BXwcrosA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 00:30:54 +0100 Message-Id: <20220320233056.18169-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320233056.18169-1-michael@niedermayer.cc> References: <20220320233056.18169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDQdwTMeYboiCfH13ug4Is+sldLtNyLIZqT1hmg90JuhHN8qokINYH4JUWlgdlPzXhcF8bb5sjVBOGkuH6DUhsaowLQOXT819IgUGnsGGPU8SfX7PuRd T+VNddJEB4jug5cxVQCwj0F5B8pBVIJRtJaSA7USfqzvOOtyb06Ahfq8o2HKJRm34Cu9gKwqmEsQ8g== Subject: [FFmpeg-devel] [PATCH 3/5] avformat/asfdec_f: Check packet_frag_timestamp X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vOPuplwP4oVs Fixes: signed integer overflow: -9223372036854775808 - 4607 cannot be represented in type 'long' Fixes: 45685/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5280102802391040 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/asfdec_f.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index a8f36ed286..b45118e5d1 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -1216,10 +1216,12 @@ static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) if ((ret = av_new_packet(&asf_st->pkt, asf_st->packet_obj_size)) < 0) return ret; asf_st->seq = asf->packet_seq; - if (asf->ts_is_pts) { - asf_st->pkt.pts = asf->packet_frag_timestamp - asf->hdr.preroll; - } else - asf_st->pkt.dts = asf->packet_frag_timestamp - asf->hdr.preroll; + if (asf->packet_frag_timestamp != AV_NOPTS_VALUE) { + if (asf->ts_is_pts) { + asf_st->pkt.pts = asf->packet_frag_timestamp - asf->hdr.preroll; + } else + asf_st->pkt.dts = asf->packet_frag_timestamp - asf->hdr.preroll; + } asf_st->pkt.stream_index = asf->stream_index; asf_st->pkt.pos = asf_st->packet_pos = asf->packet_pos; asf_st->pkt_clean = 0;