From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 26 Jan 2010 04:05:32 +0000 (+0000)
Subject: cp-demangle.c (cplus_demangle_type): Check for invalid type after "DF".
X-Git-Tag: releases/gcc-4.5.0~1067
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79b754d47ff5fef99fe57b3579ef37f135a6dc6e;p=thirdparty%2Fgcc.git

cp-demangle.c (cplus_demangle_type): Check for invalid type after "DF".

	* cp-demangle.c (cplus_demangle_type): Check for invalid type
	after "DF".
	* testsuite/demangle-expected: Add test.

From-SVN: r156226
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 1e2fbffdf74c..fcbef269c877 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-25  Ian Lance Taylor  <iant@google.com>
+
+	* cp-demangle.c (cplus_demangle_type): Check for invalid type
+	after "DF".
+	* testsuite/demangle-expected: Add test.
+
 2010-01-20  Jason Merrill  <jason@redhat.com>
 
 	PR c++/42338
@@ -294,7 +300,7 @@
 	with other than 1 operand.
 	(d_print_comp): Handle function parameters.  Fix bug with
 	function used in type of function.
-	* testsuite/demangle-expected: Upate tests.
+	* testsuite/demangle-expected: Update tests.
 
 2009-02-21  Mark Mitchell  <mark@codesourcery.com>
 
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index f28e1636921a..2f4d0cc9a30f 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -1,5 +1,5 @@
 /* Demangler for g++ V3 ABI.
-   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@wasabisystems.com>.
 
@@ -2193,6 +2193,8 @@ cplus_demangle_type (struct d_info *di)
 	    /* For demangling we don't care about the bits.  */
 	    d_number (di);
 	  ret->u.s_fixed.length = cplus_demangle_type (di);
+	  if (ret->u.s_fixed.length == NULL)
+	    return NULL;
 	  d_number (di);
 	  peek = d_next_char (di);
 	  ret->u.s_fixed.sat = (peek == 's');
diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index c201a9832711..eaa7ca9c9e58 100644
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -4019,5 +4019,8 @@ prot.lock.update
 --format=gnat
 prot__lock__update_E6s
 prot.lock.update
-
-
+#
+# Used to crash the demangler.
+--format=gnu-v3
+DFA
+DFA