From patchwork Wed Dec 28 21:45:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39805 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp4427992pzb; Wed, 28 Dec 2022 13:45:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXsiz5ZvOoy7nfOULrdHlmJtOEafXeMhq0bisKIDOjDxwqLqhrB1Fam9fXXI4uSLhNJfPNtu X-Received: by 2002:a50:9eec:0:b0:486:6d28:dabc with SMTP id a99-20020a509eec000000b004866d28dabcmr7971145edf.18.1672263932017; Wed, 28 Dec 2022 13:45:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672263932; cv=none; d=google.com; s=arc-20160816; b=krYRaCDKLwrg6nGZF20D2SG/JxF4lv29GkMPprdRHOZ1wVcI/nUQSr2+LCUpjd3fnB 0L54FwPrhVSY5GaEOEpy6sUKjE786Tl1r0t1ax31LcPLPJpzz/SwrwY2yaJm2wBycqiB JQPfMPDuoiI6pMqdhi4KkWAIL86R+0BlWMdIqg39GwDqmaGOdw4TqxZLYTa1qKS5kban ZHvPaZTf8ubcVfp8VWx3CLlEbNDPNXXcWW24+MD12gZJDM3hPeiM1tYgB29vQsHy7jTl 1zAkpXYG6cPgUQcD7QWTo+0b9jYYA7DHqkRy25Nyu+ljHIIJicEPaPi5CqCvYYz01GVk tRyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=TF2tIkgixmfz5uoQrAWP+9K1sGKgyJBfsW+H7TJPxDY=; b=IlirYvzf4TaxXNJf8n6FGtXZ/88asRj/IL+akmyKLOCXUVvy499SJzsJ2mjIgdRDrI dlx3LxXnQby7cnbJgbcUdbf7zZRyPufShbCgHjkHgZc5gK78PiFYVNoIe9sx5GlB3gLK deP0rWBK8JIWWzwwSd8JBveF/sssFGXvr0AVOBmIEOgJhasKJ2bfH1wRchd+lAKKLd5U Hxdxv0wHaUzbqEZYNDbxHLhrFRBektLE8+TgWSa5A/gbFlLsDsRY7CCPqYMa+sz7p9t2 YvBDByEQCBr46Vk2Mcjt/8MguD1ra9kMQoxd8Py2f8qu8/6A11+k4BZA14s6zVwXjxt/ Ku3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Qlk8iqrq; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g9-20020a056402090900b0046a711ae23csi14474292edz.515.2022.12.28.13.45.31; Wed, 28 Dec 2022 13:45:31 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Qlk8iqrq; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DFB9268A360; Wed, 28 Dec 2022 23:45:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C8A868A360 for ; Wed, 28 Dec 2022 23:45:21 +0200 (EET) Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-14fe0e9ed11so9964370fac.2 for ; Wed, 28 Dec 2022 13:45:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=k7jDP5Vh8bRK4EpMr4eI9lAwFP/5kLc9sBwUs+pp+cU=; b=Qlk8iqrqd4DKsbbeYgIlCe0+NlHySIpj+yeIusQQZRSUTgSGp/UgbOK2UbzFHXOvvz oFPJ76qoNNGK15OFA13GHA12KiPTi6KxAn1LE2+0p7wlEw0bUHQn/4+KnaDonMrbx1Tz bxV8+af4AiB0MOb9X3PU85ICWtsdJV9pnllkvrhbPMBZil9HmXS3ykVuU0mNBim9Ex/A Z74zFWbM759tcfXDy6pwXdUQiAgCTEdyQHcwTUpAeg8iYkBwOLwjpGGWNfLT5ZUyu6oF dupzPrAHgn2/jhkBCDSesfRB/tjP3gEUZcc/rH4kpY83bNBltoYA6aQYYw0jCdLNJZ93 ovQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=k7jDP5Vh8bRK4EpMr4eI9lAwFP/5kLc9sBwUs+pp+cU=; b=a8rO/SeYSdNyuVerSRDzSRctvCyzUzXyVteZVhjAPLDmT/7lfw2gqzTEjkuy0/CH3v b7Bdi8NOHiGK9SxfeJOS80eI6j+iZTXR2yPypqOPegIAoPfNF6zAn5sV5aFx/ez4tsK1 +lYQvNImmlyLDuLfUM/5+sDfN6gS4Vi5pW6nhQIkwGngMGJQdIg771ar84+I011GCawf MIJU9Hcw6jVR98hYA1aYh53ubrTwrfYBOb8+fHfmdhxbKvpdplhLQRSJIv1ShhwI7Sur wwrnloKhbYvuHaYSvNw12vpU8M2fi4FvpW8lqsEIYoGoXbOxVWj1r/36tU+glSs5ykOu WaAg== X-Gm-Message-State: AFqh2krIDEnqs3TtjH4I5V4/8wnHpaK4lBc5xs63DnWiV4EjetAQgAum fWZfqvSa4krk4TbLS8LvvcZSGUetLPs= X-Received: by 2002:a05:6871:4391:b0:13b:e09:9ba4 with SMTP id lv17-20020a056871439100b0013b0e099ba4mr13623615oab.10.1672263918968; Wed, 28 Dec 2022 13:45:18 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id r19-20020a4ad4d3000000b0049f3f5afcbasm6887621oos.13.2022.12.28.13.45.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Dec 2022 13:45:18 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Dec 2022 18:45:43 -0300 Message-Id: <20221228214543.300-1-jamrial@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mux: use only valid timestamps when calculating packet distance 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cdE/wuo9j3L4 Fixes: signed integer overflow: 0 - -9223372036854775808 cannot be represented in type 'long int' Fixes: fate-cover-art-aiff-id3v2-remux, fate-cover-art-mp3-id3v2-remux and fate-mov-cover-image under ubsan. Signed-off-by: James Almer --- libavformat/mux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mux.c b/libavformat/mux.c index 37fe19358d..b2b5be63b4 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -951,6 +951,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *pkt, if (s->max_interleave_delta > 0 && si->packet_buffer.head && + si->packet_buffer.head->pkt.dts != AV_NOPTS_VALUE && !flush && si->nb_interleaved_streams == stream_count+noninterleaved_count ) {