From a0a8d095d01dd674e5d9c93fbd633c8a3f6ab746 Mon Sep 17 00:00:00 2001
From: Richard Kistruck <rhsk@ravenbrook.com>
Date: Tue, 17 Feb 2009 14:47:40 +0000
Subject: [PATCH 1/2] Mps br/timing zmess.c: oops, need to (re-)initialise
 myroot array for each script, before declaring it a root.

Copied from Perforce
 Change: 167397
 ServerID: perforce.ravenbrook.com
---
 mps/code/zmess.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mps/code/zmess.c b/mps/code/zmess.c
index a96ffdca25b..a1ec5f34466 100644
--- a/mps/code/zmess.c
+++ b/mps/code/zmess.c
@@ -323,6 +323,9 @@ static void *testscriptB(void *arg, size_t s)
   die(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create");
   die(mps_pool_create(&amc, arena, mps_class_amc(), fmt, chain),
       "pool_create amc");
+  for(i = 0; i < myrootCOUNT; ++i) {
+    myroot[i] = NULL;
+  }
   die(mps_root_create_table(&root_table, arena, MPS_RANK_EXACT, (mps_rm_t)0,
                             myroot, (size_t)myrootCOUNT),
       "root_create");

From d25b1ab8e21e72bdd8d25f2523b1892691b698b3 Mon Sep 17 00:00:00 2001
From: Richard Kistruck <rhsk@ravenbrook.com>
Date: Tue, 17 Feb 2009 16:15:59 +0000
Subject: [PATCH 2/2] Mps br/timing zcoll.c: oops, need to (re-)initialise
 myroot array for each script, before declaring it a root (integ from
 zmess.c).

Copied from Perforce
 Change: 167400
 ServerID: perforce.ravenbrook.com
---
 mps/code/zcoll.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mps/code/zcoll.c b/mps/code/zcoll.c
index 192ca90e45a..962e2135f70 100644
--- a/mps/code/zcoll.c
+++ b/mps/code/zcoll.c
@@ -513,6 +513,7 @@ static void *testscriptB(void *arg, size_t s)
   mps_fmt_t fmt;
   mps_chain_t chain;
   mps_pool_t amc;
+  int i;
   mps_root_t root_table;
   mps_ap_t ap;
   mps_root_t root_stackreg;
@@ -528,6 +529,9 @@ static void *testscriptB(void *arg, size_t s)
   die(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create");
   die(mps_pool_create(&amc, arena, mps_class_amc(), fmt, chain),
       "pool_create amc");
+  for(i = 0; i < myrootCOUNT; ++i) {
+    myroot[i] = NULL;
+  }
   die(mps_root_create_table(&root_table, arena, MPS_RANK_EXACT, (mps_rm_t)0,
                             myroot, (size_t)myrootCOUNT),
       "root_create");