2007-08-03 Michael Snyder <msnyder@access-company.com>

	* jv-lang.c (java_link_class_type): Guard against NULL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5aaee7a..b816273 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-03  Michael Snyder  <msnyder@access-company.com>
+
+       * jv-lang.c (java_link_class_type): Guard against NULL.
+
 2007-08-02  Michael Snyder  <msnyder@access-company.com>
 
        * gdbtypes.c (create_set_type): Test should only be done within

diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c
index fb2b419..bed3487 100644 (file)
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -39,6 +39,7 @@
 #include "demangle.h"
 #include "dictionary.h"
 #include <ctype.h>
+#include "gdb_assert.h"
 
 struct type *java_int_type;
 struct type *java_byte_type;
@@ -351,13 +352,14 @@ java_link_class_type (struct type *type, struct value *clas)
   struct objfile *objfile = get_dynamics_objfile ();
   struct type *tsuper;
 
+  gdb_assert (name != NULL);
   unqualified_name = strrchr (name, '.');
   if (unqualified_name == NULL)
     unqualified_name = name;
 
   temp = clas;
   temp = value_struct_elt (&temp, NULL, "superclass", NULL, "structure");
-  if (name != NULL && strcmp (name, "java.lang.Object") == 0)
+  if (strcmp (name, "java.lang.Object") == 0)
     {
       tsuper = get_java_object_type ();
       if (tsuper && TYPE_CODE (tsuper) == TYPE_CODE_PTR)