From: Michael Snyder <msnyder@vmware.com>
Date: Tue, 14 Aug 2007 18:32:45 +0000 (+0000)
Subject: 2007-08-14  Michael Snyder  <msnyder@access-company.com>
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6d307763fb4e0224a97d3f44150b8e07c0943af9;p=deliverable%2Fbinutils-gdb.git

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

	* ada-lang.c (possible_user_operator_p): Guard against NULL.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dc4596d41a..298147ed4f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2007-08-14  Michael Snyder  <msnyder@access-company.com>
 
+	* ada-lang.c (possible_user_operator_p): Guard against NULL.
+
 	* varobj.c (cplus_describe_child): Guard against null.
 	Use "NULL" instead of "0" to initialize pointers.
 
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 58d820d323..0a27ba089e 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -3536,7 +3536,7 @@ possible_user_operator_p (enum exp_opcode op, struct value *args[])
         ((TYPE_CODE (type0) != TYPE_CODE_ARRAY
           && (TYPE_CODE (type0) != TYPE_CODE_PTR
               || TYPE_CODE (TYPE_TARGET_TYPE (type0)) != TYPE_CODE_ARRAY))
-         || (TYPE_CODE (type1) != TYPE_CODE_ARRAY
+         || (type1 != NULL && TYPE_CODE (type1) != TYPE_CODE_ARRAY
              && (TYPE_CODE (type1) != TYPE_CODE_PTR
                  || (TYPE_CODE (TYPE_TARGET_TYPE (type1)) 
 		     != TYPE_CODE_ARRAY))));