From patchwork Fri Oct 6 23:20:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Buka X-Patchwork-Id: 5448 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp130548jah; Fri, 6 Oct 2017 16:22:19 -0700 (PDT) X-Received: by 10.28.74.80 with SMTP id x77mr2749275wma.79.1507332139635; Fri, 06 Oct 2017 16:22:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507332139; cv=none; d=google.com; s=arc-20160816; b=emCU5quejX/By2I34kKFZfC+osilkhoPFgmKp6Q01iwPSKa2M9eRs5AL9OTAk615JT xUm0igIkpkO1y0sg4SPH3wBi5LYU9nvyyhaj9mW0a8BRyI6iT50juOmI8vZh2+qc+Jqt S8tEPkcFkH8WOZH7UcAce6gwipktE5PAXiwo5b9SzIcGbFL86pTMswSrGT+be7SKp+yZ 1A5tvVy/DeiKtimJynlJekdKjQY6W/WCROe1prHAPtj/sP+A7INnCtB2BNLTcm1lJXtW uGIM/nvlmk765+kqRpJCJ7h9T/UjTiqSRLtV8+/8zv/qOZ/J/Rd4fNNuHYHfI5/akeCG nb9Q== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=qQ3jbCDolks2dn5gixXVRp234dn2yri0MEccmXtb+r4=; b=raqrnTD3a33huQDylVCcwt+kR+40Ws3HSPXyB2Y/Gwo4goXTGyXue6I95BGNivhiPl hKGbjkeScQPl25FMbQN8VE7JHtbS+aM+FZEEqT2F6LALNQ4PU4ka0PsZJZxr9b//6Hpf CAkkzQ65qtZayHKKhSooQAi4KWYRe/0QCqGOQGEx+2jgivfY5CdjKc2iNWEKEVmD0EF3 rgKdZrayZF8twPKN5EDP7F055kwGubWCmA1oWJYzx8e7BpfQL2aDf6gllfL6dpMPffR/ 9/t/46iSQJ6j236+iD9J2FDd3ZnBARcTpgwm2rxgfB5kOm1QbCnhL7cFGRSSDi8Cxvch J2fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=QOLB3Irg; 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 l67si2118968wmi.245.2017.10.06.16.22.19; Fri, 06 Oct 2017 16:22:19 -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=QOLB3Irg; 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 162ED68A4C3; Sat, 7 Oct 2017 02:22:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4047868A148 for ; Sat, 7 Oct 2017 02:22:09 +0300 (EEST) Received: by mail-pg0-f49.google.com with SMTP id i8so886587pgd.9 for ; Fri, 06 Oct 2017 16:22:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=EOfrVHcqWqoyUTQxqm9roN4+nnTCZ/HQ7SsNQj4sgyI=; b=QOLB3IrgTTokiYeAIb+S5+TNFuUODi6p4YBftu29pZgcbuo/bSb7e1PCnhP/EkPGdS JeXz46Cc2b4E6Q0REYmcgUOJP+PfUiEO+uEfIHDoTbUnMETivwcfuKAIYArNgJiN9be9 BRehzfsHQEWZF+gQ1B1V8X6twvSSbGNGiukow9vriP40JGvNJn+fTjXwculgjKXvoCMw rAAM1m0wOOm61oTc9+4FKE6gYoAm5ceQdutuM3m/rFUsWgZYbBICfcZ0mETMb8Hi3iTL +tymyDS4AJer+EycpAumEr1bUMwMBMZ4K2GsFZlUdjKHrqVmlLqhiB+KLyB17e4rYQGC 4jhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EOfrVHcqWqoyUTQxqm9roN4+nnTCZ/HQ7SsNQj4sgyI=; b=L0jNCw8YgKWLjlXcMcKsBDGRsBQRa2iDhW8gkO18nIpaIhnVt4qvGVdlBbthhTa9/E ghW2G421JMVRI/hYpYYi285hhv3xFKt30WEwARhYqHUO65iHKro2O3yXrtNWAXIb2XY3 6NBLZpJLAFp/rAXgqbPRlsQfYJtMvvFBy72H3UhsESd4zlqQvaf+co+yyr0NRUEsRgax kVr0l2UareonWN0vYBoFd66CjijQF0RyY0fjlQ26EYsQNa7NMsj3DbMzvlVyUpgHdcwG lTlcRu7C2Og0+cbXxY/Vij/d1KkBwTKCn5LxPAhshCzheQzUlhMJDPXrInGqY/a7QPPH V1Yg== X-Gm-Message-State: AMCzsaVLzWzIqBCbgZkndb7AV18vOnPXlCRrfC6BQp+L7LtGSKXca6um /0LCCHSOf1/su9yt5Jd5mEv692/6fQ0= X-Google-Smtp-Source: AOwi7QCfzlZoumNZxEI0C6cbVHsWidlBDYXxyXa5wmU+A6sNIdceJVJt4rPSKY68GQN60+DifdMfOg== X-Received: by 10.84.128.1 with SMTP id 1mr3186468pla.238.1507332127829; Fri, 06 Oct 2017 16:22:07 -0700 (PDT) Received: from vitalybuka3.svl.corp.google.com ([2620:0:100e:401:1e30:94c5:4940:b41c]) by smtp.gmail.com with ESMTPSA id n2sm5430396pfa.118.2017.10.06.16.22.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Oct 2017 16:22:05 -0700 (PDT) From: Vitaly Buka To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Oct 2017 16:20:49 -0700 Message-Id: <20171006232049.2405-1-vitalybuka@google.com> X-Mailer: git-send-email 2.14.2.920.gcf0c67979c-goog Subject: [FFmpeg-devel] [PATCH] Fix signed integer overflow in mov_write_single_packet Detected with clang and -fsanitize=signed-integer-overflow 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 Cc: Vitaly Buka MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Vitaly Buka --- libavformat/movenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 2838286141..e70500ae2c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5354,6 +5354,10 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) // duration, but only helps for this particular track, not // for the other ones that are flushed at the same time. trk->track_duration = pkt->dts - trk->start_dts; + if (trk->start_dts != AV_NOPTS_VALUE) + trk->track_duration = pkt->dts - trk->start_dts; + else + trk->track_duration = 0; if (pkt->pts != AV_NOPTS_VALUE) trk->end_pts = pkt->pts; else