From eb4da48fa48c69e303b410c4bf7dd7bea8108406 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 22 Apr 2014 16:43:11 +0200 Subject: libdw (get_sleb128_step): Remove undefined behavior. As pointed out by gcc -fsanitize=undefined left shifting a negative value is undefined. Replace it with a multiplication of the signed value as suggested by Richard Henderson and Josh Stone. Signed-off-by: Mark Wielaard --- libdw/memory-access.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libdw/memory-access.h') diff --git a/libdw/memory-access.h b/libdw/memory-access.h index d0ee63c5..f41f783d 100644 --- a/libdw/memory-access.h +++ b/libdw/memory-access.h @@ -1,5 +1,5 @@ /* Unaligned memory access functionality. - Copyright (C) 2000-2013 Red Hat, Inc. + Copyright (C) 2000-2014 Red Hat, Inc. This file is part of elfutils. Written by Ulrich Drepper , 2001. @@ -71,7 +71,7 @@ __libdw_get_uleb128 (const unsigned char **addrp) if (likely ((__b & 0x80) == 0)) \ { \ struct { signed int i:7; } __s = { .i = __b }; \ - (var) |= (typeof (var)) __s.i << ((nth) * 7); \ + (var) |= (typeof (var)) __s.i * ((typeof (var)) 1 << ((nth) * 7)); \ return (var); \ } \ (var) |= (typeof (var)) (__b & 0x7f) << ((nth) * 7); \ -- cgit v1.2.3