diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2012-02-28 16:30:42 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2012-02-28 16:30:42 +0000 |
| commit | d4cd3da9f398080483b482e1aa5b07578697f438 (patch) | |
| tree | ff306e0777860522f21b1eb8f2aabcd509497dc9 /gdb | |
| parent | 7964b62a371300465a2bc8295cc179b7831a1e24 (diff) | |
| download | binutils-d4cd3da9f398080483b482e1aa5b07578697f438.zip binutils-d4cd3da9f398080483b482e1aa5b07578697f438.tar.gz binutils-d4cd3da9f398080483b482e1aa5b07578697f438.tar.bz2 | |
Fix ARI violation in ada_tasks_inferior_data_sniffer.
This patch removes some variable assignments inside condition
expressions.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_inferior_data_sniffer): Rework code to
avoid variable assignments inside condition.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/ada-tasks.c | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6fcb90f..a4857b8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2012-02-28 Joel Brobecker <brobecker@adacore.com> + + From Tristan Gingold <gingold@adacore.com>. + * ada-tasks.c (ada_tasks_inferior_data_sniffer): Rework code to + avoid variable assignments inside condition. + 2012-02-28 Jan Kratochvil <jan.kratochvil@redhat.com> Fix static analysis issue found by cppcheck. diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c index 4c0b667..11ad262 100644 --- a/gdb/ada-tasks.c +++ b/gdb/ada-tasks.c @@ -870,13 +870,15 @@ ada_tasks_inferior_data_sniffer (struct ada_tasks_inferior_data *data) { /* Validate. */ struct type *type = check_typedef (SYMBOL_TYPE (sym)); - struct type *eltype; - struct type *idxtype; - - if (TYPE_CODE (type) == TYPE_CODE_ARRAY - && (eltype = check_typedef (TYPE_TARGET_TYPE (type))) - && TYPE_CODE (eltype) == TYPE_CODE_PTR - && (idxtype = check_typedef (TYPE_INDEX_TYPE (type))) + struct type *eltype = NULL; + struct type *idxtype = NULL; + + if (TYPE_CODE (type) == TYPE_CODE_ARRAY) + eltype = check_typedef (TYPE_TARGET_TYPE (type)); + if (eltype != NULL + && TYPE_CODE (eltype) == TYPE_CODE_PTR) + idxtype = check_typedef (TYPE_INDEX_TYPE (type)); + if (idxtype != NULL && !TYPE_LOW_BOUND_UNDEFINED (idxtype) && !TYPE_HIGH_BOUND_UNDEFINED (idxtype)) { |