From patchwork Thu Jun 18 12:41:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20462 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 2654444BAF9 for ; Thu, 18 Jun 2020 15:49:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED3BE68B743; Thu, 18 Jun 2020 15:49:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DE5268B1B1 for ; Thu, 18 Jun 2020 15:49:12 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id f185so5523332wmf.3 for ; Thu, 18 Jun 2020 05:49:12 -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:mime-version :content-transfer-encoding; bh=UB2gIzcloh+4ew2WmezgS1L5RUPwKdoC4aE14gV6xRk=; b=hub1siQkXeT7kg2VPMEweBHDhLsVnpGs7Bd5rqaOqn+ArKbmeWYmy+fq7Lpwbs9CXX 5tXVfenGWN4YFmMmy2lcSpr3PKXyqclVMBrdckopO1d0VVN2bDeS6Waim/y5wWiS/Ghv aoEvWGSNugmUi8VuvLeVWjp4PaQJAUq/hcGVpzBRGwpvJWPcZxGnyRKUJSLSOX92dLke UKWF9nxNjzC1x/bzbUJnF+pq1FFQvR1lHMCbyMl1LQWsTl5OtKuaV3MbtTy2d8IfHi9P zL5fHim8Wet2H7WtM/4V/5MuC3nv5eVkFp4D7JeY0uIOupObDPlkljZl7l44itctmM88 YDPg== 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:mime-version :content-transfer-encoding; bh=UB2gIzcloh+4ew2WmezgS1L5RUPwKdoC4aE14gV6xRk=; b=Bpc1Dsf7vEZRlmnTYmvhKzb9e1RwutdPRy+qGISttOEP5fpxCUvOBw5yB47kCwi/H0 hex7zM7438Dt99Is3JkSnRXSkv7OCio6lAadmrGXzqYZZbrUv7G1SHFHITRwuZt4lfjf +DedR6YBytgInO7c7ykSsA0V6tWLeNpMJlOF44/KbMtXXho1Uwwr9KtjhhDfqKrAcBuw HL8syKi4KpT/uQwCP6kCiyoOvF1cGB3MOE4+GcyX9IKr5MwzwpD15XL9zfHj1y7ktH23 B0CKx3Gg5vmaL/e2C0VNgO1/2FllANsIEFzShUR7c/mMm65smrW9CKn+dXGUSkX3U29B puug== X-Gm-Message-State: AOAM533p1yYrMKvVc6yB0gwy1lkKWj9Csswww7DI7Kzj5tyH5ywdGTG9 9u9bpijHf9h0Dvanw2IQHtUkrYf1 X-Google-Smtp-Source: ABdhPJz71qd/lUorCVy3jaDF/iqEwl6Pei9rAZw413Kopufy9YTWpWavMxzz4qgGjRd0gbMijSft/Q== X-Received: by 2002:a7b:cb56:: with SMTP id v22mr4009337wmj.180.1592484090617; Thu, 18 Jun 2020 05:41:30 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id x8sm3703042wrs.43.2020.06.18.05.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2020 05:41:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jun 2020 14:41:22 +0200 Message-Id: <20200618124122.23211-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_av1: Use unsigned to avoid 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" Fixes: assertion failure Fixes: left shift of 1 by 31 places cannot be represented in type 'int' Fixes: 23264/clusterfuzz-testcase-minimized-ffmpeg_BSF_AV1_METADATA_fuzzer-6308429248593920 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg 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 29b316e011..7af63e2165 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -125,7 +125,7 @@ static int cbs_av1_write_uvlc(CodedBitstreamContext *ctx, PutBitContext *pbc, put_bits(pbc, 1, 1); } else { zeroes = av_log2(value + 1); - v = value - (1 << zeroes) + 1; + v = value - (1U << zeroes) + 1; put_bits(pbc, zeroes + 1, 1); put_bits(pbc, zeroes, v); }