From 43368e1d9ab8437079001f7a5f6ae2241acaece3 Mon Sep 17 00:00:00 2001 From: Markus Metzger Date: Wed, 23 Dec 2015 13:53:53 +0100 Subject: btrace: do not return out of TRY/CATCH In btrace_pt_readmem_callback, we read memory inside TRY/CATCH and return in case of an error return value. This corrupts the cleanup chain, which eventually results in a SEGV when doing or discarding cleanups later on. gdb/ * btrace.c (btrace_pt_readmem_callback): Do not return in TRY/CATCH. testsuite/ * gdb.btrace/dlopen.exp: New. * gdb.btrace/dlopen.c: New. * gdb.btrace/dlopen-dso.c: New. --- gdb/btrace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gdb/btrace.c') diff --git a/gdb/btrace.c b/gdb/btrace.c index b7f8106..4c88ddd 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -842,21 +842,22 @@ btrace_pt_readmem_callback (gdb_byte *buffer, size_t size, const struct pt_asid *asid, uint64_t pc, void *context) { - int errcode; + int result, errcode; + result = (int) size; TRY { errcode = target_read_code ((CORE_ADDR) pc, buffer, size); if (errcode != 0) - return -pte_nomap; + result = -pte_nomap; } CATCH (error, RETURN_MASK_ERROR) { - return -pte_nomap; + result = -pte_nomap; } END_CATCH - return size; + return result; } /* Translate the vendor from one enum to another. */ -- cgit v1.1