diff options
| -rw-r--r-- | gdb/ChangeLog | 2 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dc4596d..298147e 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 58d820d..0a27ba0 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)))); |