From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Date: Tue, 24 Sep 2019 22:03:07 +0000 (+0200)
Subject: avcodec/exr: Fix undefined left shifts of negative numbers
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8b0f949906116c40b6f1e55a1bce4447ada3219c;p=ffmpeg

avcodec/exr: Fix undefined left shifts of negative numbers

Affected the FATE-tests exr-rgb-scanline-pxr24-half-uint32-13x9 and
exr-rgb-scanline-pxr24-uint32.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index c12469cc286..28e636add3f 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]++));