From patchwork Sun Oct 6 05:23:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15527 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 1F12D44A295 for ; Sun, 6 Oct 2019 08:23:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F1517680B6C; Sun, 6 Oct 2019 08:23:28 +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 B1CCC6804E1 for ; Sun, 6 Oct 2019 08:23:22 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id b9so11480439wrs.0 for ; Sat, 05 Oct 2019 22:23:22 -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=beWxttLf5NyCt9B9fu+tosP0tj3fghe1zYNFjp4V+OI=; b=LR20f5ZtTy11u6UzmdrpQzUmDKUmGk1AE0ehoZGNiyFbi9uhAFhiu0vuZqGjJJItUr Ja5Fy0Vwuf6jg8qHIGJeziebtTPzDmlkfJOmD4N3cI/2gaZk+7GV08tSKVyK6Ok7SfWl qjrIf4xCsdWP6ebJEZYelEQzms1KsM0wY6K/01OkOH+cvptwtTJvHGBRX6SUIfsiC6t2 P7aHa8pyjwG3P4rRUrEI2Tg8DJFuD31XR59+pgdM5X078U3e6y9mAxgudExbePI4B9ll UxCHbqvT/vNM0gnvnC+VXFCAiZ272XLGLgZQB94+zJSaw8S6PZW2UWzeSCDI4BIeAYNz T6rg== 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=beWxttLf5NyCt9B9fu+tosP0tj3fghe1zYNFjp4V+OI=; b=UhJqPECq7rW25DrGAmbryQyOblwOJuf2ZhxdaIQx7S+z62jvVZ5Tf5/5d8pO3O7f/e gj/+kFCRaJV3OrEbLeKiArxw06zMfvsMjiXLeDjXfguGX5WUgyZVqlXL7gcaLU0Je9Oy CVw1W1kPVhmxHFL1lIB82keH9S8hc5uHzc7myuZQyi+WC/2N8GilgfGzykYOB+wg7zaN 0ZiZJE7xK0QSUhOxIc9frRi7mhs8dFDY8b7nPg4mPEwj00ekwimSi9qxysby4UgahMZT yTrv0gsFzCKulc6Dcsg8/S8taxAg2p01K1VJ9M4nq1x/EZDN0CqPeyF9ltWXjSi/jWuI t7cA== X-Gm-Message-State: APjAAAW4Yv9L790WMlU5KnqYBesKt4mTrYniNfytHrXz+EQpYYEKEPHw bbSCE8WADdugfsM/BCNYzTQyQ8Lld0A= X-Google-Smtp-Source: APXvYqwCKEqxg0ZoWV5PmbxbRiu1zIedyOUeHIol5l53PCxCQcDNtn4kDHd2Hs8VrYKmrNQ7wvu6wg== X-Received: by 2002:adf:ef4a:: with SMTP id c10mr8647170wrp.10.1570339401960; Sat, 05 Oct 2019 22:23:21 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id y186sm21219824wmd.26.2019.10.05.22.23.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 22:23:21 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Oct 2019 07:23:14 +0200 Message-Id: <20191006052314.28555-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190928022610.5903-10-andreas.rheinhardt@gmail.com> References: <20190928022610.5903-10-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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. Also fixes ticket #8220. Signed-off-by: Andreas Rheinhardt --- I am resending this, because in the meantime ticket #8220 has been opened about this, so that the commit message needs to be updated. 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; }