From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 25 Feb 2019 23:43:51 +0000 (+0100)
Subject: re PR c/89495 (gcc/c-family/c-format.c:1272:20: runtime error: signed integer overflo... 
X-Git-Tag: basepoints/gcc-10~939
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7da73ba7ef0e48d756677d17b8addc4f4fe2a484;p=thirdparty%2Fgcc.git

re PR c/89495 (gcc/c-family/c-format.c:1272:20: runtime error: signed integer overflow: 214748365 * 10 cannot be represented in type 'int')

	PR c/89495
	* c-format.c (maybe_read_dollar_number): Compute nargnum in
	HOST_WIDE_INT type to avoid overflows and change overflow_flag
	checking.

From-SVN: r269198
---

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 951231efaac7..72d4fd2bfc55 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,10 @@
+2019-02-25  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/89495
+	* c-format.c (maybe_read_dollar_number): Compute nargnum in
+	HOST_WIDE_INT type to avoid overflows and change overflow_flag
+	checking.
+
 2019-02-22  Richard Biener  <rguenther@suse.de>
 
 	* c-pch.c (no_checksum): Remove.
diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index 9b48ee3e3f4f..a7f76c1c01d0 100644
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -1268,9 +1268,9 @@ maybe_read_dollar_number (const char **format,
   overflow_flag = 0;
   while (ISDIGIT (*fcp))
     {
-      int nargnum;
-      nargnum = 10 * argnum + (*fcp - '0');
-      if (nargnum < 0 || nargnum / 10 != argnum)
+      HOST_WIDE_INT nargnum
+	= HOST_WIDE_INT_UC (10) * argnum + (*fcp - '0');
+      if ((int) nargnum != nargnum)
 	overflow_flag = 1;
       argnum = nargnum;
       fcp++;