From patchwork Tue Sep 24 22:03:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15273 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 D362E449BE7 for ; Wed, 25 Sep 2019 01:03:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C112E68A429; Wed, 25 Sep 2019 01:03:52 +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 81E4F689D9F for ; Wed, 25 Sep 2019 01:03:46 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id b24so1881959wmj.5 for ; Tue, 24 Sep 2019 15:03:46 -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=DmgylrWnd4R3aJWrpxQjoOQOt0zWwNwCJvnnkDUWdFQ=; b=GmEpUMbjx/V11KhvMQCZj8qYb6TPLGDc2SGmjqR2NTn2YOV5N7h1FTdH/s2LmV+Hno C9A99VC8w3AYyJd+Smd8kkpCn8/m4dyNxD4QIwDrM7cZ6ATcl3E23RMLuURrlYd7e+MM l50O9Yu/tj7Co9Xgh8t+KhAd9fomWRHuICb8E7xrtGsmpOvkwke5Er4ImCHlSfwQ0Uvi g/xGAzVUjkWp8ZEliiqgemdmGMcovR/ZV8WDR2x9czToc9XoAnlULd1ZEqCh+Y/36EUs s2fwq5gTgwXlnXiuEu0TrTHwxHgAIe1U0ItcCN5GDUQlaCBJdYvwk6skU3U8/aEVrbp/ M0Ig== 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=DmgylrWnd4R3aJWrpxQjoOQOt0zWwNwCJvnnkDUWdFQ=; b=gfTnSdE9VGLSReO37wu2/UqCkt2JiMA+Q79oreG+iYSW2gSn4DUA/iP9/uwCIfqaF+ tBwSEb6otKoU0hIBUheVcokBsSOXJO7mOIB9/qxkVB1cZwDjKgJs9WWWAPE8csHVmaPW ekH7c8tAH5X3S1y+6Tago8hpHfzo4D11Sw5skalvZycCESw0y+SXpsNVVGTpP0Sa81AH 3sACHs5lgnisQk7TxIumeXsbBS2L7XXiUVPHrALHLcAo4ytVsoUWmCT6cGJN5qcQCELq l0HvLF77wKYvRQmBUl6kCPe2Gb7L1OQO5LUujJa0pKG2VbnFeNZvFj5ZX1BU7IbrAyH2 bHew== X-Gm-Message-State: APjAAAVYqYV6wSHlAdtM9mssZiG/wUUaV1AkCvj2C5yQoO6FqO43wy2A oRxYVyGk3A6FbX2IAIf9eObiurhR X-Google-Smtp-Source: APXvYqxPf+5Tpd3s3ZX/d/CSKXfKu3JU4W+SKSoWmRlSSV8+tyVFbmT4kRG6wLd49DHrScPNxEtQww== X-Received: by 2002:a1c:a90b:: with SMTP id s11mr3006875wme.92.1569362625770; Tue, 24 Sep 2019 15:03:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 15:03:45 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2019 00:03:07 +0200 Message-Id: <20190924220310.31157-13-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 12/15] avcodec/exr: Fix undefined left shifts of negative numbers 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" Affected the FATE-tests exr-rgb-scanline-pxr24-half-uint32-13x9 and exr-rgb-scanline-pxr24-uint32. Signed-off-by: Andreas Rheinhardt --- libavcodec/exr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index c12469cc28..28e636add3 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -881,7 +881,7 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t *src, in = ptr[3] + s->xdelta; for (j = 0; j < s->xdelta; ++j) { - uint32_t diff = (*(ptr[0]++) << 24) | + uint32_t diff = ((uint32_t)*(ptr[0]++) << 24) | (*(ptr[1]++) << 16) | (*(ptr[2]++) << 8 ) | (*(ptr[3]++));