From f88e792f29e20a580861f3a626abc6f965eec14d Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Mon, 14 Feb 2011 10:32:20 +0000 Subject: [PATCH] Merge from trunk, r11515 (Don't produce suppression stack pseudo-traces with more than VG_MAX_SUPP_CALLERS entries in them.) git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_6_BRANCH@11548 --- coregrind/m_errormgr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c index 96638e55e3..d043747667 100644 --- a/coregrind/m_errormgr.c +++ b/coregrind/m_errormgr.c @@ -376,10 +376,14 @@ static void gen_suppression(Error* err) VG_(xaprintf)(text, " %s\n", xtra); // Print stack trace elements + UInt n_ips = VG_(get_ExeContext_n_ips)(ec); + tl_assert(n_ips > 0); + if (n_ips > VG_MAX_SUPP_CALLERS) + n_ips = VG_MAX_SUPP_CALLERS; VG_(apply_StackTrace)(printSuppForIp_nonXML, text, VG_(get_ExeContext_StackTrace)(ec), - VG_(get_ExeContext_n_ips)(ec)); + n_ips); VG_(xaprintf)(text, "}\n"); // zero terminate -- 2.47.2