From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7063 invoked by alias); 22 Jan 2014 16:00:42 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 7048 invoked by uid 89); 22 Jan 2014 16:00:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 22 Jan 2014 16:00:40 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0MG0aO3012543 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 22 Jan 2014 11:00:37 -0500 Received: from barimba.redhat.com (ovpn-113-85.phx2.redhat.com [10.3.113.85]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0MG01PB031078; Wed, 22 Jan 2014 11:00:01 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 1/3] fix crash in frame filters Date: Wed, 22 Jan 2014 16:00:00 -0000 Message-Id: <1390406399-26664-2-git-send-email-tromey@redhat.com> In-Reply-To: <1390406399-26664-1-git-send-email-tromey@redhat.com> References: <1390406399-26664-1-git-send-email-tromey@redhat.com> X-SW-Source: 2014-01/txt/msg00861.txt.bz2 apply_frame_filter calls ensure_python_env before computing the gdbarch to use. This means that python_gdbarch can be NULL while in Python code, and if a frame filter depends on this somehow (easy to do), gdb will crash. The fix is to compute the gdbarch first. Built and regtested on x86-64 Fedora 18. New test case included. 2014-01-22 Tom Tromey PR python/16491: * python/py-framefilter.c (apply_frame_filter): Call ensure_python_env after computing gdbarch. 2014-01-22 Tom Tromey PR python/16491: * gdb.python/py-framefilter.py (Reverse_Function.function): Read a string from an inferior frame. * gdb.python/py-framefilter-mi.exp: Update. --- gdb/ChangeLog | 6 ++++++ gdb/python/py-framefilter.c | 8 ++++---- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.python/py-framefilter-mi.exp | 4 ++-- gdb/testsuite/gdb.python/py-framefilter.py | 5 ++++- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index 76ce4e5..c6a29ef 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -1477,18 +1477,18 @@ apply_frame_filter (struct frame_info *frame, int flags, if (!gdb_python_initialized) return PY_BT_NO_FILTERS; - cleanups = ensure_python_env (gdbarch, current_language); - TRY_CATCH (except, RETURN_MASK_ALL) { gdbarch = get_frame_arch (frame); } if (except.reason < 0) { - gdbpy_convert_exception (except); - goto error; + /* Let gdb try to print the stack trace. */ + return PY_BT_NO_FILTERS; } + cleanups = ensure_python_env (gdbarch, current_language); + iterable = bootstrap_python_frame_filters (frame, frame_low, frame_high); if (iterable == NULL) diff --git a/gdb/testsuite/gdb.python/py-framefilter-mi.exp b/gdb/testsuite/gdb.python/py-framefilter-mi.exp index 58c8d35..0c5f5d4 100644 --- a/gdb/testsuite/gdb.python/py-framefilter-mi.exp +++ b/gdb/testsuite/gdb.python/py-framefilter-mi.exp @@ -66,10 +66,10 @@ mi_continue_to_line [gdb_get_line_number {Backtrace end breakpoint} ${srcfile}] "step to breakpoint" mi_gdb_test "-stack-list-frames" \ - "\\^done,stack=\\\[frame={level=\"0\",addr=\"$hex\",func=\"cnuf_dne\".*},frame={level=\"1\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"2\",addr=\"$hex\",func=\"bcnuf\".*},frame={level=\"3\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"22\",addr=\"$hex\",func=\"1cnuf\".*,children=\\\[frame={level=\"23\",addr=\"$hex\",func=\"func2\".*}\\\]},frame={level=\"24\",addr=\"$hex\",func=\"3cnuf\".*},frame={level=\"27\",addr=\"$hex\",func=\"niam\".*}\\\].*" \ + "\\^done,stack=\\\[frame={level=\"0\",addr=\"$hex\",func=\"cnuf_dne.*\".*},frame={level=\"1\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"2\",addr=\"$hex\",func=\"bcnuf\".*},frame={level=\"3\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"22\",addr=\"$hex\",func=\"1cnuf\".*,children=\\\[frame={level=\"23\",addr=\"$hex\",func=\"func2\".*}\\\]},frame={level=\"24\",addr=\"$hex\",func=\"3cnuf\".*},frame={level=\"27\",addr=\"$hex\",func=\"niam\".*}\\\].*" \ "filtered stack listing" mi_gdb_test "-stack-list-frames 0 3" \ - "\\^done,stack=\\\[frame={level=\"0\",addr=\"$hex\",func=\"cnuf_dne\".*},frame={level=\"1\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"2\",addr=\"$hex\",func=\"bcnuf\".*},frame={level=\"3\",addr=\"$hex\",func=\"acnuf\".*}\\\]" \ + "\\^done,stack=\\\[frame={level=\"0\",addr=\"$hex\",func=\"cnuf_dne.*\".*},frame={level=\"1\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"2\",addr=\"$hex\",func=\"bcnuf\".*},frame={level=\"3\",addr=\"$hex\",func=\"acnuf\".*}\\\]" \ "filtered stack list 0 3" mi_gdb_test "-stack-list-frames 22 24" \ "\\^done,stack=\\\[frame={level=\"22\",addr=\"$hex\",func=\"1cnuf\".*,children=\\\[frame={level=\"23\",addr=\"$hex\",func=\"func2\".*}\\\]},frame={level=\"24\",addr=\"$hex\",func=\"3cnuf\".*}\\\]" \ diff --git a/gdb/testsuite/gdb.python/py-framefilter.py b/gdb/testsuite/gdb.python/py-framefilter.py index 1cf8c22..25b3368 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.py +++ b/gdb/testsuite/gdb.python/py-framefilter.py @@ -30,8 +30,11 @@ class Reverse_Function (FrameDecorator): fname = str (self.fobj.function()) if (fname == None or fname == ""): return None + if fname == 'end_func': + extra = self.fobj.inferior_frame().read_var('str').string() else: - fname = fname[::-1] + extra = '' + fname = fname[::-1] + extra return fname class Dummy (FrameDecorator): -- 1.8.1.4