From eeda7b98fd56143456039b37ba71aa54dd68fe80 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 31 Mar 2008 17:38:38 +0000 Subject: [PATCH] cp-demangle.c (d_substitution): Correct overflow check to avoid -fstrict-overflow optimizations. * cp-demangle.c (d_substitution): Correct overflow check to avoid -fstrict-overflow optimizations. From-SVN: r133761 --- libiberty/ChangeLog | 5 +++++ libiberty/cp-demangle.c | 13 ++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index c85691c40e1..0e8424d56e8 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2008-03-31 Ian Lance Taylor + + * cp-demangle.c (d_substitution): Correct overflow check to avoid + -fstrict-overflow optimizations. + 2008-03-27 Paolo Bonzini * configure.ac (frags): Don't set, use frag instead. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index edcfedca7a5..71a28ab539b 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -2681,21 +2681,24 @@ d_substitution (struct d_info *di, int prefix) c = d_next_char (di); if (c == '_' || IS_DIGIT (c) || IS_UPPER (c)) { - int id; + unsigned int id; id = 0; if (c != '_') { do { + unsigned int new_id; + if (IS_DIGIT (c)) - id = id * 36 + c - '0'; + new_id = id * 36 + c - '0'; else if (IS_UPPER (c)) - id = id * 36 + c - 'A' + 10; + new_id = id * 36 + c - 'A' + 10; else return NULL; - if (id < 0) + if (new_id < id) return NULL; + id = new_id; c = d_next_char (di); } while (c != '_'); @@ -2703,7 +2706,7 @@ d_substitution (struct d_info *di, int prefix) ++id; } - if (id >= di->next_sub) + if (id >= (unsigned int) di->next_sub) return NULL; ++di->did_subs;