From: Michael Snyder <msnyder@vmware.com>
Date: Wed, 5 Sep 2007 00:07:07 +0000 (+0000)
Subject: 2007-09-04  Michael Snyder  <msnyder@access-company.com>
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7d63ec12b1a2ee139aa79364d39e698b235c3ebb;p=deliverable%2Fbinutils-gdb.git

2007-09-04  Michael Snyder  <msnyder@access-company.com>

	* gnu-v2-abi.c (gnuv2_value_rtti_type): Guard against null.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1b52ca0fad..848041a931 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2007-09-04  Michael Snyder  <msnyder@access-company.com>
 
+	* gnu-v2-abi.c (gnuv2_value_rtti_type): Guard against null.
+
 	* stabsread.c (patch_block_status): Guard against null.
 	* Makefile.in (stabsread.o): Depend on gdb_assert.h.
 
diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c
index def2911824..2d76f97560 100644
--- a/gdb/gnu-v2-abi.c
+++ b/gdb/gnu-v2-abi.c
@@ -192,7 +192,7 @@ gnuv2_value_rtti_type (struct value *v, int *full, int *top, int *using_enc)
   CORE_ADDR vtbl;
   struct minimal_symbol *minsym;
   struct symbol *sym;
-  char *demangled_name;
+  char *demangled_name, *p;
   struct type *btype;
 
   if (full)
@@ -252,7 +252,9 @@ gnuv2_value_rtti_type (struct value *v, int *full, int *top, int *using_enc)
 
   /* If we just skip the prefix, we get screwed by namespaces */
   demangled_name=cplus_demangle(demangled_name,DMGL_PARAMS|DMGL_ANSI);
-  *(strchr(demangled_name,' '))=0;
+  p = strchr (demangled_name, ' ');
+  if (p)
+    *p = '\0';
 
   /* Lookup the type for the name */
   /* FIXME: chastain/2003-11-26: block=NULL is bogus.  See pr gdb/1465. */