From patchwork Sat Sep 28 02:26:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15346 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 1839F449F5A for ; Sat, 28 Sep 2019 05:34:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 00B6468A4F6; Sat, 28 Sep 2019 05:34:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07BE66899C5 for ; Sat, 28 Sep 2019 05:34:01 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id p7so7793260wmp.4 for ; Fri, 27 Sep 2019 19:34:01 -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=kt+iZGAPRelOC3105nuwGVAk3aFhy2+tne+cxQfn9CsLMzcYu7/GgmCK88ME1xsenX /FSV/+riDLlX7j1Eq8yF0yLpyz0rQgLr2YqI2OFxE1YYQJVz7bSPXftEyXvoPX7fPQuo USY8qwpA78m+AYvygtkh+qYwZ6TB66QW8mQwrhMdMOdzezfcB6L71AOXDiAaY9IkERbB inZCFQ2g4ANktPzu9TkJMCc6ogHcpEv5uZ41jfMi8dV2UV9DnHYSLsfSBqmxPjUaquT8 GoLXTANdF0Uad/ZzOZNBIV3rsrJAGOApPAuzWExSJ6w3NNHhu3Z/tMQijzGw4zPMwxJs VGYQ== 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=PXigcW3JQGuedMgZ7RFZ7TXS5vY0qfZ9l4uKfJ++ex0JfQIfmVNM8i32B3JeOb9eAE LddjGGp+v7m83uSOsPKypV5W2zPwMA7Lfr2/z1oAh0k6BMR9dO+wQjwT+DjHnOj0HjVs Ks2hpCWM2J8wCvHjetkXOiyWEaKEtYihBrYDyDqvEOVTr8FtMkg0qb8eRu16URDVuGE/ LBGLn3MIOJB2f3l2yGTzPx9oRBJrygrTF1DKirWNSBSQYJaUP9zzg0wNvqPNlRD1eNGf pv2IaoiuOgb6Z5CW9KEq3zeHMADqG1SNREfGuODDsN9XrcMvcz8fWV0IUu/70fJcd2Ai O1Ew== X-Gm-Message-State: APjAAAWqQ2re/6WrfDxS4Bq/ZgdSC/dNafHr9MUlO6puLnW04Ur1Q6Pf 3eFuTUyxkGhv1+GEWAS6l0Ibe+Th X-Google-Smtp-Source: APXvYqxXTL62dyrjj9Ke2bgY1Ad0ZhxMwnPvWSrvUi/bpDTOSmGUOUJg8w0aSr3ft8ALIJihQaBkCQ== X-Received: by 2002:a1c:5454:: with SMTP id p20mr9554982wmi.93.1569638040707; Fri, 27 Sep 2019 19:34:00 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id r7sm4484231wrx.87.2019.09.27.19.33.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 19:34:00 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Sep 2019 04:26:05 +0200 Message-Id: <20190928022610.5903-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190928022610.5903-1-andreas.rheinhardt@gmail.com> References: <20190928022610.5903-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 10/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; }