diff mbox

[FFmpeg-devel,12/15] avcodec/exr: Fix undefined left shifts of negative numbers

Message ID 20190924220310.31157-13-andreas.rheinhardt@gmail.com
State Accepted
Commit 8b0f949906116c40b6f1e55a1bce4447ada3219c
Headers show

Commit Message

Andreas Rheinhardt Sept. 24, 2019, 10:03 p.m. UTC 
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>
---
 libavcodec/exr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Sept. 26, 2019, 7:05 p.m. UTC | #1 
On Wed, Sep 25, 2019 at 12:03:07AM +0200, Andreas Rheinhardt wrote:
> 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>
> ---
>  libavcodec/exr.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

thx

[...]
diff mbox

Patch

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]++));