widl: Fix overflow when left-shifting.

Signed-off-by: Jarkko Korpi <jarkko_korpi@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

widl: Fix overflow when left-shifting.
bb9b2f33 · Jarkko Korpi · Alexandre Julliard · d418ece9 · bb9b2f33
Commit bb9b2f33 authored Jun 21, 2016 by Jarkko Korpi Committed by Alexandre Julliard Jun 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

expr.c tools/widl/expr.c +4 -4

No files found.
--- a/tools/widl/expr.c
+++ b/tools/widl/expr.c
@@ -222,8 +222,8 @@ expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr)
            e->is_const = TRUE;
            if (is_signed_integer_type(tref))
            {
-                cast_mask = (1 << (cast_type_bits - 1)) - 1;
-                if (expr->cval & (1 << (cast_type_bits - 1)))
+                cast_mask = (1u << (cast_type_bits - 1)) - 1;
+                if (expr->cval & (1u << (cast_type_bits - 1)))
                    e->cval = -((-expr->cval) & cast_mask);
                else
                    e->cval = expr->cval & cast_mask;
@@ -231,8 +231,8 @@ expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr)
            else
            {
                /* calculate ((1 << cast_type_bits) - 1) avoiding overflow */
-                cast_mask = ((1 << (cast_type_bits - 1)) - 1) |
-                            1 << (cast_type_bits - 1);
+                cast_mask = ((1u << (cast_type_bits - 1)) - 1) |
+                            1u << (cast_type_bits - 1);
                e->cval = expr->cval & cast_mask;
            }
        }