From patchwork Tue Jul 17 21:37:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fredrik Hubinette X-Patchwork-Id: 9748 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp94459jad; Tue, 17 Jul 2018 14:46:33 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcOiH9ZnnwbpTMJD7+W5oVIN7xxHJDEsC8TTCe0IhCXxmDGwnj2zaKns+6snIgxjzodrYzp X-Received: by 2002:a1c:4489:: with SMTP id r131-v6mr2281900wma.128.1531863993631; Tue, 17 Jul 2018 14:46:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531863993; cv=none; d=google.com; s=arc-20160816; b=j6Z/uzUpSHucUSidE3kwGN3lzlKLbayMRa3Kf6E0DUe/z5gDxVDo+eHyNSKIo2b9Je yigyUjGZZPpdbF6/I1phhnodwaI3o7c/nEEtSB4kN8v+3UDGLDWzSe6Z+uwSvtirP47g D3iBb1cgaoRofRYMPU1M2k8twrBz9ixgNBxZS3G9odqgOI+VOW8xKz8PMvPHJS5I9ZA+ Qn2KRlqYTin/WU8MaSJxo59ASoCJ0P+HCW9Qoo1jfIL1uyLX5+IS1Ft5sfd0e8mt0E+1 /ny25yMwg3NJp4uAVGeugHerGE3DU8DtraTmUTXk71UbMxhgRGAbuRxXTZu7mVWEacYI IP5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=6/HEpLJVD5dAEyB5iRxE/qyDJbl7CpJPYGQOpFL1oJU=; b=sj7lnybSQKYvvUw3HEmq1H5aRlWAAFtF1G5Zi9OTaSn/rcWatUoZ50kfOFPR2Eex4K N2uLAUkzQOlskoezqZea+tjaipQiYHqx+DChKpY8tdb17qadFMmWkIeLgzg1UDx55T0c ua+guvsCtr8GCgZO4zs8DoqQ0pwvG5yrkgnEQfY506p3q4P5wD+AzFHXOBq+/Z/3V+xI +2CuiTohjmqW1Oam9kitpg8DtpDAU/5/2ZGbL1GrdyoVX0aGL1rp4T9bUFNVjEjVILmW R3R4N/lzSfkx9TBX0OjMRV1sl6+IAuwKicNL4qTwGcVynkpp9i8oYAMWOXFzsl8F983s bwog== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b="FDz/MbS1"; 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 f12-v6si1573560wrs.447.2018.07.17.14.46.33; Tue, 17 Jul 2018 14:46:33 -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; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b="FDz/MbS1"; 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 1864E68083A; Wed, 18 Jul 2018 00:46:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb0-f182.google.com (mail-yb0-f182.google.com [209.85.213.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26AFE680504 for ; Wed, 18 Jul 2018 00:46:14 +0300 (EEST) Received: by mail-yb0-f182.google.com with SMTP id k124-v6so1034303ybk.6 for ; Tue, 17 Jul 2018 14:46:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=aN+nBMy2+pBLwXK8OrxaA0CPx8ymWQgtowrDzrbqOHs=; b=FDz/MbS1hrGfiOq4YQfezTHs5XYEbRmJ2bO8rr01bg07IpI8Uv43VqaF+4Yov3Jmyx PqKjyS7C0Lx3IBQHWGJp52PFPRufXN2IatLCuDF70BKRvrRQB1Brqlx5ghW0xzCdKQWl apRN9uVU9TPOr6kh6zGdESJLBlVfRQFIdz38N1hu2Qc6NevYBt/TYiLrfEuqtIKsqLcR v6DMH2QvEmMwGl7Sepfjzrx58Ec4MAeHtp2Y9O4AXUynjtR+Hzrl9v/HziVafgzeFcwD VPjD7BmRf4potP6SH80o+8Y3iMu9c2kHe1ipF8Q6P2WztMDvgcaWjiLCb3C9qonpKmL5 5r5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=aN+nBMy2+pBLwXK8OrxaA0CPx8ymWQgtowrDzrbqOHs=; b=fPvAEOfBYB5+unDqTP5BQJAoBDnDpKJDdsoaHOvAG2PNpuWxUmWnIaN9DR6+YFGF7n 3CZMmNTs0A0jEozFEdSgVbi0le2V/5bQoRQrm/+Zu1yAUED9m4K1vP8NZ6vbuG0b+cmN jxtW7KkcPHFEKcus+a3c2a0906UaQnwNkB3vtVP0LNwC746UMqNAF5wNkKi6SzaJHNUA jMHmAxGmo8H3F6dNQvzXpXnMFXsFYDqHjD+suJGBSHW18sTM2v/USEF9qr9ws0+tgTrG U4qWH/ykCepeyA1GOSk9t71JqJElLr8nBBMiytjRZbmXk6+d5B33VszafcCxoukHSSda BRFw== X-Gm-Message-State: AOUpUlFotncY1YXskJ7sB/SEv0uHKh59znYJStmZC4av97K3slAySwvK /HTiMBcBp3HY1WYE/DdfMW+5xRNmuO4KF3+hsECKzfHZ X-Received: by 2002:a25:4210:: with SMTP id p16-v6mr1818200yba.294.1531863487459; Tue, 17 Jul 2018 14:38:07 -0700 (PDT) MIME-Version: 1.0 From: Fredrik Hubinette Date: Tue, 17 Jul 2018 14:37:55 -0700 Message-ID: To: ffmpeg-devel X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] Avoid undefined behavior when start_time_text is -1<<63 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" From d7bd55c3d280c10b990577003a985296f10a2b59 Mon Sep 17 00:00:00 2001 From: Fredrik Hubinette Date: Tue, 17 Jul 2018 14:35:55 -0700 Subject: [PATCH] Avoid undefined behavior when start_time_text is -1<<63 --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index c9cdd2b470..5b83ed7872 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2666,7 +2666,7 @@ static void update_stream_timings(AVFormatContext *ic) duration = FFMAX(duration, duration1); } } - if (start_time == INT64_MAX || (start_time > start_time_text && start_time - start_time_text < AV_TIME_BASE)) + if (start_time == INT64_MAX || (start_time > start_time_text && start_time - AV_TIME_BASE < start_time_text )) start_time = start_time_text; else if (start_time > start_time_text) av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream starttime %f\n", start_time_text / (float)AV_TIME_BASE); -- 2.18.0.203.gfac676dfb9-goog