From: Nick Clifton <nickc@redhat.com>
Date: Mon, 28 Oct 2019 16:45:55 +0000 (+0000)
Subject: Fix potentially illegal shift and assign operation in CSKY disassembler.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ee3542c0a3830cac933ae56cc5f29e9c3f7c6ca;p=binutils-gdb.git

Fix potentially illegal shift and assign operation in CSKY disassembler.

	* csky-dis.c (csky_chars_to_number): Check for a negative
	count. Use an unsigned integer to construct the return value.
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 8489b407882..5f5a6c869b1 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-28  Nick Clifton  <nickc@redhat.com>
+
+	* csky-dis.c (csky_chars_to_number): Check for a negative
+	count. Use an unsigned integer to construct the return value.
+
 2019-10-28  Nick Clifton  <nickc@redhat.com>
 
 	* tic30-dis.c (OPERAND_BUFFER_LEN): Define.  Use as length of
diff --git a/opcodes/csky-dis.c b/opcodes/csky-dis.c
index efd1f75052b..ffdb5964958 100644
--- a/opcodes/csky-dis.c
+++ b/opcodes/csky-dis.c
@@ -134,10 +134,10 @@ csky_get_mask (struct csky_opcode_info const *pinfo)
 static unsigned int
 csky_chars_to_number (unsigned char * buf, int n)
 {
-  if (n == 0)
+  if (n <= 0)
     abort ();
   int i;
-  int val = 0;
+  unsigned int val = 0;
 
   if (dis_info.info->endian == BFD_ENDIAN_BIG)
     while (n--)