From edefe1dab2efc4cd0c9f3ee448a1ff3745705554 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 30 May 2013 17:18:54 +0000 Subject: [PATCH] fix py-value.c Some code in py-value.c could exit a loop without running some cleanups made in the loop. * python/py-value.c (valpy_binop): Call do_cleanups before exiting loop. --- gdb/ChangeLog | 5 +++++ gdb/python/py-value.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 08f247c..1f07f38 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2013-05-30 Tom Tromey + * python/py-value.c (valpy_binop): Call do_cleanups before + exiting loop. + +2013-05-30 Tom Tromey + * python/py-prettyprint.c (print_children): Remove extra do_cleanups call. diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 0b2a38f..0d87219 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -769,11 +769,17 @@ valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other) a gdb.Value object and need to convert it from python as well. */ arg1 = convert_value_from_python (self); if (arg1 == NULL) - break; + { + do_cleanups (cleanup); + break; + } arg2 = convert_value_from_python (other); if (arg2 == NULL) - break; + { + do_cleanups (cleanup); + break; + } switch (opcode) { -- 2.7.4