From patchwork Fri Mar 9 01:37:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7880 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp430318jaj; Thu, 8 Mar 2018 17:38:29 -0800 (PST) X-Google-Smtp-Source: AG47ELseLNFJ2SfSYaPesVFUIFfII2K5KqFfy7L25ZGzxhRZRFf9aVjJ4UVqoy98aFjrfy5A4gjB X-Received: by 10.28.4.20 with SMTP id 20mr622733wme.100.1520559509082; Thu, 08 Mar 2018 17:38:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520559509; cv=none; d=google.com; s=arc-20160816; b=Vy3VHNSelLplp/8puJ9MG7rR5gFj00mHczLRdOrFW9UFJ6hqiYR9ihcpBBbCVQJ8+P Ep3CaZoxAUZ8jlVv5BGs6+rTMju1F2wqqRi0AYFgOuGv4Be9qPIY+1y5kfvOmocFlQKU 8st8SiMnOSSy8PbBKnZNKf2xbWT2UTdVBWzIF//yK8d7ypEy0RSf1WvwuhBWXY6YKITo z7YIjMk9Iutd4FAp55/OMoTjdpAniDhqF/wmaqCpnzt1ytqxVsdlnWoYJpnSK11zEw+9 yU+EJ9SHWc//y5pyH2XRaTxyisWJ3HpBAyywQ/bbQhaKM6D1M12Bjxf/A41CRMQKwwe4 20dA== 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:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=Mpc6phXMLVzipc4tLjwqVKyfQzvbCGETHD7MRH0zO8Y=; b=PalDzfMHzGB6dSedDlm7TWHQekYKVEOJ+QC2gNOXm3vQuBGBMv6bTPORnD1+/4o0th y6hQMsu1IZd6w1kIp+uyxDBOqU+H1O3qhfuEnX5FQ05Z4qTiQmrrVZGSX6XXKY16CAyt 722Rj3n+vtj3tdHPtjIC6oXFmdAURUGKXfHp0LZMAZVssGqdc9medzpTPC3ItiRHotLx YfMehLgzvUFnuv7EyeBT+KBzUzY8hZh4kMqFOA7hVot6+REcaJNsZOh8XyafNvMtIPeg YmVo0hA6/tER06GGNe1zRyt2KENnYCrj2U/yLxC0mA234Hb3CAIOe1nn7ZMowENWoiEL dzlg== 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 e124si123807wma.105.2018.03.08.17.38.28; Thu, 08 Mar 2018 17:38:29 -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; 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 8052B68A6BE; Fri, 9 Mar 2018 03:38:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-3.mx.upcmail.net (vie01a-dmta-pe07-3.mx.upcmail.net [84.116.36.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7196368A68B for ; Fri, 9 Mar 2018 03:37:57 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eu6z0-0003sN-Bx for ffmpeg-devel@ffmpeg.org; Fri, 09 Mar 2018 02:38:06 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Kde31x00P0S5wYM01de4A0; Fri, 09 Mar 2018 02:38:04 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 9 Mar 2018 02:37:53 +0100 Message-Id: <20180309013754.24682-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180309013754.24682-1-michael@niedermayer.cc> References: <20180309013754.24682-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/oggparseogm: Fix undefined shift in ogm_packet() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: shift exponent 48 is too large for 32-bit type 'int' Fixes: Chromium bug 786793 Reported-by: Matt Wolenetz Reviewed-by: Matt Wolenetz Signed-off-by: Michael Niedermayer --- libavformat/oggparseogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index ca6b62669d..4b4edf26ca 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -180,7 +180,7 @@ ogm_packet(AVFormatContext *s, int idx) os->psize -= lb + 1; while (lb--) - os->pduration += p[lb+1] << (lb*8); + os->pduration += (uint64_t)p[lb+1] << (lb*8); return 0; }