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 dc4596d41acaed64062dcef25bed504bceb32630..298147ed4f948332ea326dbe7be39ff8e9d139fa 100644 (file)
--- 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 58d820d3239bd93634b8aab9a82f3733faf03efc..0a27ba089e57fb9be829efa2e51093aabaf43ee7 100644 (file)
--- 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))));