summaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorjanis <janis@138bc75d-0d04-0410-961f-82ee72b054a4>2007-05-14 23:43:07 +0000
committerjanis <janis@138bc75d-0d04-0410-961f-82ee72b054a4>2007-05-14 23:43:07 +0000
commitc55e2f1bb07ad7617c2bb41e5cbb43edb3e51697 (patch)
treeb853079a0b6c6486743cd6cf3116784b5035dce2 /libcpp
parentd400d997d4658629ecf1c3a41689c662f0b0740d (diff)
downloadgcc-c55e2f1bb07ad7617c2bb41e5cbb43edb3e51697.tar.gz
libcpp/
PR c/31924 * expr.c (interpret_float_suffix): Check for invalid suffix. gcc/testsuite/ PR c/31924 * gcc.dg/fltconst-1.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124730 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog5
-rw-r--r--libcpp/expr.c19
2 files changed, 16 insertions, 8 deletions
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;
}