From patchwork Tue Sep 24 22:03:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15276 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 9ABE7449BE7 for ; Wed, 25 Sep 2019 01:03:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86B7468A55C; Wed, 25 Sep 2019 01:03:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99BBE68A3DF for ; Wed, 25 Sep 2019 01:03:48 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id i18so3783084wru.11 for ; Tue, 24 Sep 2019 15:03:48 -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=Ii5AJlzKaMbLRqylto60IiLovdLZFPOa5a4MJPTcBMY=; b=hdRbNO3Ug4MOD4y4kWAvlTWxGIzrG/hWO9oUY4D+W/7RyaL9bnwWDEpt1HbDakxtv0 p+8DbBif7iw74N6jobCiKLMTDjQ8xES/Nch5fyohGu8oncZPhpvcGxQe7ZfD/NUF+2NQ jtnSEh1K6K8f2/ripaBpSADRD75FDSfd35OZw5ebjzPfloKFvdGRx7k4xvLSBfkfPgyf yQ+xn+5BSi7boPvXnSd2U5/rQ0+W5NqWc/GqX91FHgscLvxNl8z2ED6Ph/daHH9T1UOS zVJQG+wUiaDqz0MAvpmFchQAG1m/3ffuo5xTLkisMw/69KbffieCRALYQa4WBilgiJpz k4IA== 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=Ii5AJlzKaMbLRqylto60IiLovdLZFPOa5a4MJPTcBMY=; b=L+hN9ckjq8OwjLui/JdQ55Qy1eIRyYltknxjZ1AZN4rfY7kcnE0+3nq8ZV2fG/Kug7 m3jTHQHhftQaw48OEfAhn/JoFClNmb6RWPSMcqfH96IgRJU8w1QThztFSMNF+qr5P29n c/1XkkughRBHvZxoKht4QEt5/CJsVszggfUAl4pdC71+TPmnHTtu28eBvC1mWAcn8ssz gGawVCqMeNLB4hWXpnLsGfknMplN1cXkc63SCdP8f9jgNUcGr5hQGLzTUDN5DGCWXBJv U2gT6AEcjrAw6pm1xatw6E3xeQg1UCrRj1+J2JDDKG/70aonRVUZnd311/xj43yWVbue 2UsA== X-Gm-Message-State: APjAAAWlw3MmZTXT4QqynnNmiz4qWc51pFH8aVm7WvTS2E7yzTKxGbr/ OPjZvQrbdI/MDOETAL22PN0rlHsh X-Google-Smtp-Source: APXvYqzLSU+hPz9dDLPxZriSAWZ00wDvwunS9JnNbeLXWjk9jF0F6U7yXfpC18LF/+1VFcpSMtDkYw== X-Received: by 2002:adf:f78a:: with SMTP id q10mr5232138wrp.276.1569362627703; Tue, 24 Sep 2019 15:03:47 -0700 (PDT) Received: from sblaptop.fritz.box ([188.192.248.87]) by smtp.gmail.com with ESMTPSA id l1sm3023808wrb.1.2019.09.24.15.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 15:03:47 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2019 00:03:09 +0200 Message-Id: <20190924220310.31157-15-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924220310.31157-1-andreas.rheinhardt@gmail.com> References: <20190924220310.31157-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/15] avcodec/cinepakenc: Fix invalid shifts 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: left shift of 1 by 31 places cannot be represented in type 'int'. Affected the FATE-tests vsynth1-cinepak, vsynth2-cinepak and vsynth_lena-cinepak. Signed-off-by: Andreas Rheinhardt --- libavcodec/cinepakenc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/cinepakenc.c b/libavcodec/cinepakenc.c index 93917fafe8..6024df0fba 100644 --- a/libavcodec/cinepakenc.c +++ b/libavcodec/cinepakenc.c @@ -544,8 +544,9 @@ static int encode_mode(CinepakEncContext *s, int h, uint8_t *last_data[4], int last_linesize[4], strip_info *info, unsigned char *buf) { - int x, y, z, flags, bits, temp_size, header_ofs, ret = 0, mb_count = s->w * h / MB_AREA; + int x, y, z, bits, temp_size, header_ofs, ret = 0, mb_count = s->w * h / MB_AREA; int needs_extra_bit, should_write_temp; + uint32_t flags; unsigned char temp[64]; // 32/2 = 16 V4 blocks at 4 B each -> 64 B mb_info *mb; uint8_t *sub_scratch_data[4] = { 0 }, *sub_last_data[4] = { 0 }; @@ -599,7 +600,7 @@ static int encode_mode(CinepakEncContext *s, int h, flags = 0; for (y = x; y < FFMIN(x + 32, mb_count); y++) if (s->mb[y].best_encoding == ENC_V4) - flags |= 1 << (31 - y + x); + flags |= 1U << (31 - y + x); AV_WB32(&buf[ret], flags); ret += 4; @@ -626,13 +627,13 @@ static int encode_mode(CinepakEncContext *s, int h, for (x = 0; x < mb_count; x++) { mb = &s->mb[x]; - flags |= (mb->best_encoding != ENC_SKIP) << (31 - bits++); + flags |= (uint32_t)(mb->best_encoding != ENC_SKIP) << (31 - bits++); needs_extra_bit = 0; should_write_temp = 0; if (mb->best_encoding != ENC_SKIP) { if (bits < 32) - flags |= (mb->best_encoding == ENC_V4) << (31 - bits++); + flags |= (uint32_t)(mb->best_encoding == ENC_V4) << (31 - bits++); else needs_extra_bit = 1; } @@ -651,7 +652,7 @@ static int encode_mode(CinepakEncContext *s, int h, } if (needs_extra_bit) { - flags = (mb->best_encoding == ENC_V4) << 31; + flags = (uint32_t)(mb->best_encoding == ENC_V4) << 31; bits = 1; }