summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/gcc.dg/fltconst-1.c16
-rw-r--r--libcpp/ChangeLog5
-rw-r--r--libcpp/expr.c19
4 files changed, 35 insertions, 8 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c5eb928acd7..b195815eda0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2007-05-14 Janis Johnson <janis187@us.ibm.com>
+ PR c/31924
+ * gcc.dg/fltconst-1.c: New test.
+
* gcc.dg/dfp/func-mixed.c: Replace invalid constant suffixes.
* gcc.dg/dfp/operator-assignment.c: Ditto.
diff --git a/gcc/testsuite/gcc.dg/fltconst-1.c b/gcc/testsuite/gcc.dg/fltconst-1.c
new file mode 100644
index 00000000000..bf922270644
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/fltconst-1.c
@@ -0,0 +1,16 @@
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99" } */
+
+double a = 1.ld; /* { dg-error "invalid suffix" } */
+double b = 1.fd; /* { dg-error "invalid suffix" } */
+double c = 1.di; /* { dg-error "invalid suffix" } */
+double d = 1.dj; /* { dg-error "invalid suffix" } */
+double e = 1.id; /* { dg-error "invalid suffix" } */
+double f = 1.jd; /* { dg-error "invalid suffix" } */
+double g = 1.ddd; /* { dg-error "invalid suffix" } */
+double h = 1.ldd; /* { dg-error "invalid suffix" } */
+double i = 1.dld; /* { dg-error "invalid suffix" } */
+double j = 1.ddl; /* { dg-error "invalid suffix" } */
+double k = 1.fdd; /* { dg-error "invalid suffix" } */
+double l = 1.dfd; /* { dg-error "invalid suffix" } */
+double m = 1.ddf; /* { dg-error "invalid suffix" } */
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index cc5a71692c7..5b941ff9cca 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-14 Janis Johnson <janis187@us.ibm.com>
+
+ PR c/31924
+ * expr.c (interpret_float_suffix): Check for invalid suffix.
+
2007-05-02 Eric Christopher <echristo@apple.com>
* expr.c (num_div_op): Don't overflow if the result is
diff --git a/libcpp/expr.c b/libcpp/expr.c
index a00614026c2..8401daee032 100644
--- a/libcpp/expr.c
+++ b/libcpp/expr.c
@@ -87,16 +87,19 @@ interpret_float_suffix (const uchar *s, size_t len)
while (len--)
switch (s[len])
{
- case 'f': case 'F': f++; break;
- case 'l': case 'L': l++; break;
- case 'i': case 'I':
- case 'j': case 'J': i++; break;
- case 'd': case 'D':
- /* Disallow fd, ld suffixes. */
- if (d && (f || l))
+ case 'f': case 'F':
+ if (d > 0)
+ return 0;
+ f++;
+ break;
+ case 'l': case 'L':
+ if (d > 0)
return 0;
- d++;
+ l++;
break;
+ case 'i': case 'I':
+ case 'j': case 'J': i++; break;
+ case 'd': case 'D': d++; break;
default:
return 0;
}
OpenPOWER on IntegriCloud