From patchwork Wed Sep 18 03:26:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15127 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DEFC4449FBC for ; Wed, 18 Sep 2019 06:32:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C704268978D; Wed, 18 Sep 2019 06:32:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CFC168816E for ; Wed, 18 Sep 2019 06:32:31 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id r17so3766517wme.0 for ; Tue, 17 Sep 2019 20:32:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uT5bFVeUUqPJKSnJY7dwUbQP1TTIHWQKgNZUfItDbaY=; b=FvNHb4c2GMX+4Nmrd36nIS74oHdjd+4NFoxqOyzv38Es+d22mOYuVDJSfWzno0PR6i mEMjKNJdSqt3OcAERIp3aPO/QqXGA1f3ajPmqg7ifrnLwTZiAvI1wvm0vP9B1rGpyyOu p1w3wDk2CXNclYev4jKZ2fiG9lALsgxabHLrGNDwEYY/l72kHrsAEkLmdKupeEwFyHAs dTF5zyKIel8s5VyGbDtZmgEjnjbGLdrX2rDehKcMx8mBsZa58Ym9XTuK2WRzpLTNVB0R zTfAjH0LSvlnSsp+96n9LdapsNcxo8ZnK7LSnr3pnoDnoqDSYcqn9kEtJ6xSauD0sXSr ykJg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=uT5bFVeUUqPJKSnJY7dwUbQP1TTIHWQKgNZUfItDbaY=; b=jyMdu6sQpHhRgxsfCQWfRoO4VX+FeTx6XPeDUENjk9v/sBWD+dGNzwNAR+q3+6E/c8 veS4EpQmPHs23o5SfV5U7q5u1UeBDY9TYLprTWTp6YcWk3Jc48Gx0eFcQgSR8nvDXDdK zYw5SD4SqWaht6bR1iBgv/Ci8tg/SoWQCBJYHRLjSV6DgvANrs6TvjERMKHQmYYNofui PAQdhmYsdyjT48rqluUUnyoaLwmwVbm9wcbNOZODn/GdbQDvfUAHnfZbPnBCPmgsRlFa E482IZLI3eip51IjArF6syr/2Ws4ux2SuzWR5+6j608OvqwBk6t3cZ5iKHq9l2W8w4+a +qZA== X-Gm-Message-State: APjAAAWMEOEfNAap+2B5VlZZmGOu/aSLSFrOwP7FLYvZ4zhiR8qEiqju b6zKMc25d8sA0wLcRgqfrF11T/yCD9M= X-Google-Smtp-Source: APXvYqwi8JQnXiXJWmK0N0wqCNOe7ripx5MuLoMaJusFCMhgo7IdZdqmstV1rdGhrz8QO3MY31dVeg== X-Received: by 2002:a7b:c306:: with SMTP id k6mr886894wmj.127.1568777550721; Tue, 17 Sep 2019 20:32:30 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id 189sm806891wmz.19.2019.09.17.20.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 20:32:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Sep 2019 05:26:00 +0200 Message-Id: <20190918032607.11774-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190918032607.11774-1-andreas.rheinhardt@gmail.com> References: <20190918032607.11774-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10] avcodec/cbs_av1: Fix potential undefined shift 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 1 << w is undefined as soon as w is >= 31, as 1 has type int. In the case of cbs_av1_read_ns, w could potentially even be 32, so one has to use a 64bit type. (None of the current callers ever use arguments that are so large that the above scenario can happen, but this might change in the future.) Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_av1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 98cd37ef74..0ff6d60ae2 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -220,7 +220,7 @@ static int cbs_av1_read_ns(CodedBitstreamContext *ctx, GetBitContext *gbc, position = get_bits_count(gbc); w = av_log2(n) + 1; - m = (1 << w) - n; + m = (1LL << w) - n; if (get_bits_left(gbc) < w) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid non-symmetric value at "