From patchwork Tue Nov 28 22:28:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 6429 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3747792jah; Tue, 28 Nov 2017 14:29:25 -0800 (PST) X-Google-Smtp-Source: AGs4zMafwBov7ubbPmhABKGkQohTh4bXZn4OOhSpCYYCKLWA9xFBF8qCwaqdQ2lh5IE36xAsVQwU X-Received: by 10.223.176.27 with SMTP id f27mr543297wra.105.1511908165852; Tue, 28 Nov 2017 14:29:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511908165; cv=none; d=google.com; s=arc-20160816; b=gvniXb44K0quzTse8fpexWx4YXjVm5PUGrBhIBmcvNyjWVEocgZh88Z6KTHgkng3iJ IUmaM2/hrWH7/AHEW1i2nYM01Pw9PVaXWaRx840TTIRRlW8WhqBbDXuYCHwvXRaY9CjI FGhMo5qNpXm2FnjFvXeRP4xPv8pMR4NY4xKgVO2zoJqXo3JnOvK8yo5yWKGDuvG54jIs fhduccUqhMrO6DtyCeLZRrrX1GxXKB6cSBTa684ptqoPDhQWmhsm2YFremqPX9YFvewp 9XSaxYNWQaTy1EEaYNdjBs+ku3JuaInw4a1vKaWP8OnxdXBg286aGPjV+gk29+IezWUC Xx1A== 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:dkim-signature :delivered-to:arc-authentication-results; bh=lmNuRnSzJz9s3zIQVuuba3h3Mn3zt0/DKX4u1pv3q+8=; b=PV9WhLH3pnnTaY2o0KfBMAa8RirvDU1dENw8ddS31o0QJMUtIUuyKaeQqAYsLlnkMn 3b84F3y9Udl7soqq1qV88q3QlCHjWoN8OEVIszTDiy4FJGCEgPH61W4NLuc/Krr8Bzmv 7+DFTq9yDF8LKSyt8lbIiZ/S/ICaEhrl1cUUyfsQkhUIYwf6p++ub1lr9v7LLuMCL90Q OeCMDzqgYr9dqOIzfvb0txg+4QxRVwuzm7Ui/takHfT3UcBUfTisPLER5Vm+Wio7mmhY mQ35XYv7u93fcf2mhcxRNTEH/madYHVERFTT/78d2d32naWl/i4y1esvGh5Lczo7psav n+Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=RrevbvmS; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=a9P4Qc5W; 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=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m18si349430wma.202.2017.11.28.14.29.25; Tue, 28 Nov 2017 14:29:25 -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=@google.com header.s=20161025 header.b=RrevbvmS; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=a9P4Qc5W; 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=NONE dis=NONE) header.from=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC56768A26F; Wed, 29 Nov 2017 00:29:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3716C68A15C for ; Wed, 29 Nov 2017 00:29:15 +0200 (EET) Received: by mail-wm0-f45.google.com with SMTP id g130so33785295wme.0 for ; Tue, 28 Nov 2017 14:29:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to; bh=mvPdzjvsjjfohheYZBgOjn9pFKZeaaBOKy7dP8h/iGU=; b=RrevbvmSrIY1YZtmtljFqp78vE0Dh4aPoBofeBSib6Sd31EbOgkCaQqhJU4PyXxayo ohDVfzGzRM5FGeXVhA5TbWo2r7ftbOoORm50hjLs5AlsdW/Yat7MVFfTKtGX89jBgguo 4/JGboL/dbxc74aWKSbW6Dq2FEDLd4dQL2mVMvdm8tKDTmLQ+lhiy7zRexH5pmAk6iZK g13tcnuE4Fc9oV8pM1xeHzGmHqO9pSFftrTCteylGbc6xU/5juNsLpu+FIZq1C5L7KDr 25LAjVg5JAk/eauwEL8KAR04A7HTEUA8UNKo77p3PciUVvSBD0i/s8Bu/tP4XBcBDmR1 Lpmg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:from:date:message-id:subject:to; bh=mvPdzjvsjjfohheYZBgOjn9pFKZeaaBOKy7dP8h/iGU=; b=a9P4Qc5WvNaoVI2x1DfPFpA+Xu2KedasPqKHfgA1ny9bBlx24wflxakYoC2WQeJytZ zHpQkCw8W1M4Q/DsudfO+YaK2c98EAr0K3aPVRJcTXwtig9tKmS8QgiXAlD8CcmlCq0O DYA/3jOJc25+soEopwGNckxg7bIXzgqgOhA/Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=mvPdzjvsjjfohheYZBgOjn9pFKZeaaBOKy7dP8h/iGU=; b=bnNMmhRz6c8On3xt3SFFu/EBurU2FLuxp1Qqir8jeioT4xpLWdsG2xS/GT76ZmDnAi H0zaYhP+zdrRb5Ep4HyHrPOOwltpQdjDpUx5SeKohEQxDiW0p2GfC7TpxEy/J7gk521o hug4KU4uR1Tv9b6E1HZEuTjg+BByk6E8p7VREdkLQOQnWgjmgFkz1z9Ypc69j4X83p9k NugRXxNZuIHqNdspTlfp7YAMiYsPqBvUNx+Z03WkJI7RKDC3V8mJF/pA6PFrjgXr1Wwt hSOuTBRLhTS6pLlQtQ2lcSEI5kD5vBG7vPkAu94vRQfemSjlc5Xd7URWaluoWELmfVb5 N0Fw== X-Gm-Message-State: AJaThX6v4eZjie3jTKE8c9E5qWlFnpuFCqXjhHpAYuJ0s6Cux7Q3yyAA ZtA/WzaEqP6jNW/AmGd8d0PGYQzjdJK4kgdzdY1ZWRqz+ng= X-Received: by 10.28.160.6 with SMTP id j6mr949790wme.125.1511908156773; Tue, 28 Nov 2017 14:29:16 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.161.4 with HTTP; Tue, 28 Nov 2017 14:28:55 -0800 (PST) From: Dale Curtis Date: Tue, 28 Nov 2017 14:28:55 -0800 X-Google-Sender-Auth: 1AdWYqL_B8ulwu16PxYuICkaG7Y Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [oggvp8] Don't manipulate duration when it's AV_NOPTS_VALUE. 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" This leads to signed integer overflow. Signed-off-by: Dale Curtis From c1fa869b79aeb314f30746a561903fcfa8f305fb Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Tue, 28 Nov 2017 14:26:55 -0800 Subject: [PATCH] [oggvp8] Don't manipulate duration when it's AV_NOPTS_VALUE. This leads to signed integer overflow. Signed-off-by: Dale Curtis --- libavformat/oggparsevp8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/oggparsevp8.c b/libavformat/oggparsevp8.c index c534ab117d..b76ac71cc5 100644 --- a/libavformat/oggparsevp8.c +++ b/libavformat/oggparsevp8.c @@ -125,7 +125,7 @@ static int vp8_packet(AVFormatContext *s, int idx) os->lastdts = vp8_gptopts(s, idx, os->granule, NULL) - duration; if(s->streams[idx]->start_time == AV_NOPTS_VALUE) { s->streams[idx]->start_time = os->lastpts; - if (s->streams[idx]->duration) + if (s->streams[idx]->duration && s->streams[idx]->duration != AV_NOPTS_VALUE) s->streams[idx]->duration -= s->streams[idx]->start_time; } } -- 2.15.0.417.g466bffb3ac-goog