diff options
| author | Tom Tromey <tromey@redhat.com> | 2011-06-27 19:21:51 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2011-06-27 19:21:51 +0000 |
| commit | 5fe41fbfa22275d2a277b408bf52fedec34e8336 (patch) | |
| tree | 9aed1be88020a4add3cfcbe7562642ad3236d91a /gdb/python/py-breakpoint.c | |
| parent | 57eb9b5086fe082ad965e75d199dd9d536e54250 (diff) | |
| download | fsf-binutils-gdb-5fe41fbfa22275d2a277b408bf52fedec34e8336.zip fsf-binutils-gdb-5fe41fbfa22275d2a277b408bf52fedec34e8336.tar.gz fsf-binutils-gdb-5fe41fbfa22275d2a277b408bf52fedec34e8336.tar.bz2 | |
* valops.c (find_overload_match): Call do_cleanups before early
return.
* top.c (execute_command): Call do_cleanups before early return.
(command_loop): Likewise.
* stack.c (backtrace_command): Make a null cleanup early. Don't
conditionally call do_cleanups.
* python/py-value.c (TRY_CATCH): Move cleanup handling into
TRY_CATCH.
* python/py-breakpoint.c (gdbpy_breakpoint_has_py_cond): Rearrange
so cleanups are always run.
* mi/mi-cmd-var.c (mi_cmd_var_delete): Reset old_cleanups.
* findcmd.c (parse_find_args): Call do_cleanups on early return
path.
* dbxread.c (elfstab_build_psymtabs): Make a null cleanup early.
Don't conditionally call do_cleanups.
* cli/cli-script.c (execute_user_command): Initialize 'old_chain'
later.
Diffstat (limited to 'gdb/python/py-breakpoint.c')
| -rw-r--r-- | gdb/python/py-breakpoint.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index e73dc24..294e648 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -771,10 +771,9 @@ gdbpy_breakpoint_has_py_cond (struct breakpoint_object *bp_obj) get_current_arch (); struct cleanup *cleanup = ensure_python_env (garch, current_language); - if (py_bp == NULL) - return 0; + if (py_bp != NULL) + has_func = PyObject_HasAttrString (py_bp, stop_func); - has_func = PyObject_HasAttrString (py_bp, stop_func); do_cleanups (cleanup); return has_func; |