diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2009-07-07 21:03:00 +0000 |
|---|---|---|
| committer | Paul Pluzhnikov <ppluzhnikov@google.com> | 2009-07-07 21:03:00 +0000 |
| commit | 06878dd230569add279019d670f7fb14d1cc368b (patch) | |
| tree | 844320bd37f931b361c9f8d42770486d019130d3 | |
| parent | 570e2b1a04ef8ec53e236b0bdd2fae2c777e3268 (diff) | |
| download | gdb-06878dd230569add279019d670f7fb14d1cc368b.zip gdb-06878dd230569add279019d670f7fb14d1cc368b.tar.gz gdb-06878dd230569add279019d670f7fb14d1cc368b.tar.bz2 | |
2009-07-07 Paul Pluzhnikov <ppluzhnikov@google.com>
* python/python-value.c (valpy_getitem): Remove incorrect assert.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/python/python-value.c | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1178a93..e54fd13 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2009-07-07 Paul Pluzhnikov <ppluzhnikov@google.com> + * python/python-value.c (valpy_getitem): Remove incorrect assert. + +2009-07-07 Paul Pluzhnikov <ppluzhnikov@google.com> + * python/python-value.c (valpy_getitem): Don't return from TRY_CATCH. 2009-07-07 Sami Wagiaalla <swagiaal@redhat.com> diff --git a/gdb/python/python-value.c b/gdb/python/python-value.c index 948ff06..a0bf2db 100644 --- a/gdb/python/python-value.c +++ b/gdb/python/python-value.c @@ -294,17 +294,10 @@ valpy_getitem (PyObject *self, PyObject *key) } } - if (res_val == NULL) - { - gdb_assert (field == NULL); - return NULL; - } - - if (field) - xfree (field); + xfree (field); GDB_PY_HANDLE_EXCEPTION (except); - return value_to_value_object (res_val); + return res_val ? value_to_value_object (res_val) : NULL; } static int |