Merge r5999 (BartV: Don't print more lines of a stack-trace than were

obtained.)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6027

diff --git a/coregrind/m_stacktrace.c b/coregrind/m_stacktrace.c
index 0eb2d0e4f67750bfceba5414e47957749fba3189..c502a3f5a3edaef3e67df801ee1ba3d6e439c15a 100644 (file)
--- a/coregrind/m_stacktrace.c
+++ b/coregrind/m_stacktrace.c
@@ -412,8 +412,8 @@ void VG_(pp_StackTrace) ( StackTrace ips, UInt n_ips )
 void VG_(get_and_pp_StackTrace) ( ThreadId tid, UInt n_ips )
 {
    Addr ips[n_ips];
-   VG_(get_StackTrace)(tid, ips, n_ips);
-   VG_(pp_StackTrace) (     ips, n_ips);
+   UInt n_ips_obtained = VG_(get_StackTrace)(tid, ips, n_ips);
+   VG_(pp_StackTrace)(ips, n_ips_obtained);
 }