From ea37c2b41267a5d6a07999b4841b05e13e28bbc7 Mon Sep 17 00:00:00 2001 From: tromey Date: Mon, 24 Aug 2009 18:55:21 +0000 Subject: [PATCH] * python/python-value.c (valpy_richcompare): Don't return from inside a TRY_CATCH. --- gdb/ChangeLog | 5 +++++ gdb/python/python-value.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dcd1e6b4b8..cfe6035635 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2009-08-24 Tom Tromey + + * python/python-value.c (valpy_richcompare): Don't return from + inside a TRY_CATCH. + 2009-08-22 Ralf Wildenhues * CONTRIBUTE: Bump documented Autoconf version. diff --git a/gdb/python/python-value.c b/gdb/python/python-value.c index c4217d571d..3d88aa31f8 100644 --- a/gdb/python/python-value.c +++ b/gdb/python/python-value.c @@ -693,7 +693,10 @@ valpy_richcompare (PyObject *self, PyObject *other, int op) { value_other = convert_value_from_python (other); if (value_other == NULL) - return NULL; + { + result = -1; + break; + } switch (op) { case Py_LT: @@ -720,11 +723,16 @@ valpy_richcompare (PyObject *self, PyObject *other, int op) /* Can't happen. */ PyErr_SetString (PyExc_NotImplementedError, "Invalid operation on gdb.Value."); - return NULL; + result = -1; + break; } } GDB_PY_HANDLE_EXCEPTION (except); + /* In this case, the Python exception has already been set. */ + if (result < 0) + return NULL; + if (result == 1) Py_RETURN_TRUE; -- 2.11.0