From ae53364610e53bb7551c33dbb85adc6442cdf412 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 13 Dec 2001 00:05:32 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 6 ++++++ libiberty/cplus-dem.c | 3 +++ libiberty/testsuite/demangle-expected | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index b816727..3537cae 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2001-12-12 Craig Rodrigues + + PR other/2719 + * cplus-dem.c (consume_count): Treat negative count as an error. + * testsuite/demangle-expected: Added testcase. + Tue Dec 11 07:08:57 2001 Douglas B. Rupp * configure.in: Hardcode that vfork works on VMS host. diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c index a35ff14..159f8d5 100644 --- a/libiberty/cplus-dem.c +++ b/libiberty/cplus-dem.c @@ -574,6 +574,9 @@ consume_count (type) (*type)++; } + if (count < 0) + count = -1; + return (count); } diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 4953c7d..3a82847 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -2586,3 +2586,7 @@ JArray.t(JArray[]) --format=java _ZN4Prim1iEibcdfwPN4java4lang6StringEsx Prim.i(int, boolean, byte, double, float, char, java.lang.String, short, long) +# +--format=hp +_Utf58_0_1__1_2147483647__2147483648 +_Utf58_0_1__1_2147483647__2147483648 -- 2.7.4