diff options
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 5 | ||||
| -rw-r--r-- | libcpp/expr.c | 19 |
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; } |
