merge bug-fix components of r9106:

  Fix a minor bug, whereby a stack entry of zero would cause a "(heap
  allocation functions)" line to be written.

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_4_BRANCH@9210

diff --git a/massif/ms_main.c b/massif/ms_main.c
index 8e6d898e260016a22f03fd990241f0f7e270c0ea..a6062fcaaade8616a00011e78fa6a3d9e5833879 100644 (file)
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -1925,7 +1925,7 @@ static void pp_snapshot_SXPt(Int fd, SXPt* sxpt, Int depth, Char* depth_str,
    switch (sxpt->tag) {
     case SigSXPt:
       // Print the SXPt itself.
-      if (sxpt->Sig.ip == 0) {
+      if (0 == depth) {
          ip_desc =
             "(heap allocation functions) malloc/new/new[], --alloc-fns, etc.";
       } else {