From e63f184e3f8cb7710ab1c76379c77a0728a6360a Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 22 Sep 2006 19:19:32 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 6 ++++++ libiberty/cp-demangle.c | 2 ++ libiberty/testsuite/demangle-expected | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 0705a14a5f..5081525fc7 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2006-09-22 Ian Lance Taylor + + PR other/29176 + * cp-demangle.c (d_substitution): Check for overflow when + computing substitution index. + 2006-08-30 Corinna Vinschen * configure.ac: Add case for Mingw as host. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index c7ee8786d9..2fa59785f2 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -2505,6 +2505,8 @@ d_substitution (struct d_info *di, int prefix) id = id * 36 + c - 'A' + 10; else return NULL; + if (id < 0) + return NULL; c = d_next_char (di); } while (c != '_'); diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 4aaa3d639e..3f5622f79b 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -3811,3 +3811,8 @@ make _Z1fM1AKiPKS1_ f(int const A::*, int const A::* const*) f +# This used to cause a core dump in the demangler -- PR 29176 +--format=auto --no-params +SASDASDFASDF_sdfsdf +SASDASDFASDF_sdfsdf +SASDASDFASDF_sdfsdf -- 2.34.1