system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 20:06:18 +00:00
Code Issues Projects Releases Wiki Activity

widl: Fix overflow when left-shifting.

Browse Source 
Signed-off-by: Jarkko Korpi <jarkko_korpi@hotmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jarkko Korpi 2016-06-21 09:23:22 +03:00 committed by Alexandre Julliard
parent d418ece9d0
commit bb9b2f33ae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/widl/expr.c
View File

@ -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;
}
}