From patchwork Mon Apr 11 21:21:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35262 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1255386pzh; Mon, 11 Apr 2022 14:21:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZNwqrjW3+LM6tasOzphaOLOkTwUXG+clvvk4CyBa6reEYsNuCku+48Fuwe7z1pBacSgrD X-Received: by 2002:a17:907:c0c:b0:6d1:8c46:6415 with SMTP id ga12-20020a1709070c0c00b006d18c466415mr32237993ejc.326.1649712113072; Mon, 11 Apr 2022 14:21:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649712113; cv=none; d=google.com; s=arc-20160816; b=FsoCKomMsTUY0MWD2z3aOlAm5gY/T3RoYv4cqS+yoxNBzuZ06TLioFFy1A1TAKAE1L 2QcsEi4P2hpcpMJOUJKSd/xFw1MbhdAnCFAZJnup6nnU8dhtIdxZJCz20OckVoXPseY3 gh63HnIjAIVeXYSNlr/eM40u0HWur7yzTigHXxOfwk0vzzHGBVfRbKf2MAydcAqTndyq BG2ecEoIW8jJ1OKwrNTFH4mjxusO7Bw6QNjZU4B5FdgS/TRCkhT+8Yuzw7TdieDS+70q SWtrgehbuX47iztP0Tx3b78UHQTId8TIpsup9S0gIvK9tIrnoLke6Ax9GAoQBBgWQGlH ZNZQ== 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:message-id:date:to:from:delivered-to; bh=Rl2UBSs4xv64GOvqY9yxJoYmde0TA54NMbolYqF1kA4=; b=nZNi48A327geVazFif/ArxJBEG7Z/nWttwbvhpV09suCGKF7XrC34+Y5mrTzdiYFmC 7Bdb1m1g+4qvRKKiKV7AzDK8ectieGF2kHBKq65zw+e3JwvEzbEkLqs6lOujZtKx3CUa LoIgon3b8DMtUu1vlXjK7fOzQwhD3akHXZr3HceIaKFVlKhzPZSO7njkLDw/Oob1dRiT WWZogrTzTOlYRzK4XYloKghV7ldGPH0M8PtnQXPILw8o4OsjRWSVEJiX5wXYJO5m7G9Y zUVs+FF3Ej9ieQyyNhbKHptyLFhZ8rX0wjBIgeQZqdjqmCoAnnysJDU3PjS325gC3lwq p4Uw== 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 h17-20020a1709063b5100b006df76385f02si2159914ejf.930.2022.04.11.14.21.52; Mon, 11 Apr 2022 14:21:53 -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 E8A7068B327; Tue, 12 Apr 2022 00:21:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A751D68B072 for ; Tue, 12 Apr 2022 00:21:42 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ne1Tb-0003We-IG for ffmpeg-devel@ffmpeg.org; Mon, 11 Apr 2022 23:21:35 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id e1S1n9xH4SgGFe1Tbn3knM; Mon, 11 Apr 2022 23:21:35 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id e1TMn537HOPqFe1TMnh0he; Mon, 11 Apr 2022 23:21:20 +0200 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=62549bdf a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=Pn_H9mZTd-MzJ9i-SBYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 11 Apr 2022 23:21:17 +0200 Message-Id: <20220411212120.15692-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfOnTEj5VmUYX4HAa4976X+Zn/ztLfCKsaQrooI7qyuFzDFQARCVZ8Sgw/VrbqCTR3HlVGaATQfiRuKQVunK/jOR62HGpjEcHuVUFSEUYOH4HX8E0c0Ep 59dfYUf15XcaJOdoFXAWJZg4Pv6HIVM4SmaL5/Q136cPMAB1JnbdIu32EyRTX90ofeRC3xwogF7lww== Subject: [FFmpeg-devel] [PATCH 1/4] avformat/demux: Use unsigned to check duration vs duration_text 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: VpbdqnSZmf0J Fixes: signed integer overflow: 9223371898743775808 - -138111000000 cannot be represented in type 'long' Fixes: 46245/clusterfuzz-testcase-minimized-ffmpeg_dem_OGG_fuzzer-5075129786302464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/demux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index ef189d9d8e..ad7b5dbf83 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1612,7 +1612,7 @@ static void update_stream_timings(AVFormatContext *ic) else if (end_time < end_time_text) av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream endtime %f\n", end_time_text / (float)AV_TIME_BASE); - if (duration == INT64_MIN || (duration < duration_text && duration_text - duration < AV_TIME_BASE)) + if (duration == INT64_MIN || (duration < duration_text && (uint64_t)duration_text - duration < AV_TIME_BASE)) duration = duration_text; else if (duration < duration_text) av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream duration %f\n", duration_text / (float)AV_TIME_BASE);