From: Alan Modra <amodra@gmail.com>
Date: Thu, 23 Jul 2015 03:11:38 +0000 (+0930)
Subject: Fix ubsan signed integer overflow
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=070fe95d07c78349f0c8f0fa90aeb92d05248483;p=binutils-gdb.git

Fix ubsan signed integer overflow

IMO a fairly useless warning in this case, but technically correct.

	PR 18708
	* i386-dis.c (get64): Avoid signed integer overflow.
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 6ba1b856d9f..f1ec2b030fe 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-23  Alan Modra  <amodra@gmail.com>
+
+	PR 18708
+	* i386-dis.c (get64): Avoid signed integer overflow.
+
 2015-07-22  Alexander Fomin  <alexander.fomin@intel.com>
 
 	PR binutils/18631
@@ -82,7 +87,7 @@
 
 2015-06-19  Peter Bergner  <bergner@vnet.ibm.com>
 
-        * ppc-dis.h (skip_optional_operands): Use ppc_optional_operand_value.
+	* ppc-dis.h (skip_optional_operands): Use ppc_optional_operand_value.
 	* ppc-opc.c (FXM4): Add non-zero optional value.
 	(TBR): Likewise.
 	(SXL): Likewise.
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index e7680292039..a279b56d7f6 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -15387,11 +15387,11 @@ get64 (void)
   a = *codep++ & 0xff;
   a |= (*codep++ & 0xff) << 8;
   a |= (*codep++ & 0xff) << 16;
-  a |= (*codep++ & 0xff) << 24;
+  a |= (*codep++ & 0xffu) << 24;
   b = *codep++ & 0xff;
   b |= (*codep++ & 0xff) << 8;
   b |= (*codep++ & 0xff) << 16;
-  b |= (*codep++ & 0xff) << 24;
+  b |= (*codep++ & 0xffu) << 24;
   x = a + ((bfd_vma) b << 32);
 #else
   abort ();