2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com>

	* cp-demangle.c (d_number): Avoid signed int overflow.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@277575 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index bba2be8b81bed0afea5197fbb1d583bfc685d6a8..4992b15d681a470548d1509fa466c5ccd6993f0d 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-29 Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+       * cp-demangle.c (d_number): Avoid signed int overflow.
+
 2019-10-28  Miguel Saldivar  <saldivarcher@gmail.com>
 
        * cp-demangle.c (d_print_mod): Add a space before printing `complex`

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 877ad359be115b716a8467f1d1d4aa8f23971c2b..5b674d7d93c4612723c9580c05ee7806d774d16c 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -1717,7 +1717,7 @@ d_number (struct d_info *di)
        }
       if (ret > ((INT_MAX - (peek - '0')) / 10))
         return -1;
-      ret = ret * 10 + peek - '0';
+      ret = ret * 10 + (peek - '0');
       d_advance (di, 1);
       peek = d_peek_char (di);
     }