From 44a94343108c6701814b7ef2ca3b3b195fb87bd5 Mon Sep 17 00:00:00 2001
From: Kevin Tew <tewk@racket-lang.org>
Date: Tue, 14 Sep 2010 11:31:00 -0600
Subject: [PATCH] Places: mark msg_memory

---
 src/racket/src/mzmark.c    | 2 ++
 src/racket/src/mzmarksrc.c | 1 +
 src/racket/src/places.c    | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/racket/src/mzmark.c b/src/racket/src/mzmark.c
index 5d3ee50e06..13efaf3ecc 100644
--- a/src/racket/src/mzmark.c
+++ b/src/racket/src/mzmark.c
@@ -3432,6 +3432,7 @@ static int place_async_channel_val_MARK(void *p, struct NewGC *gc) {
   Scheme_Place_Async_Channel *pac = (Scheme_Place_Async_Channel *)p;
   int i;
   gcMARK2(pac->msgs, gc);
+  gcMARK2(pac->msg_memory, gc);
   for (i = pac->size; i--; )
     gcMARK2(pac->msgs[i], gc);
 
@@ -3443,6 +3444,7 @@ static int place_async_channel_val_FIXUP(void *p, struct NewGC *gc) {
   Scheme_Place_Async_Channel *pac = (Scheme_Place_Async_Channel *)p;
   int i;
   gcFIXUP2(pac->msgs, gc);
+  gcFIXUP2(pac->msg_memory, gc);
   for (i = pac->size; i--; )
     gcFIXUP2(pac->msgs[i], gc);
 
diff --git a/src/racket/src/mzmarksrc.c b/src/racket/src/mzmarksrc.c
index 9193429171..a8b2c50ccc 100644
--- a/src/racket/src/mzmarksrc.c
+++ b/src/racket/src/mzmarksrc.c
@@ -1390,6 +1390,7 @@ place_async_channel_val {
   Scheme_Place_Async_Channel *pac = (Scheme_Place_Async_Channel *)p;
   int i;
   gcMARK2(pac->msgs, gc);
+  gcMARK2(pac->msg_memory, gc);
   for (i = pac->size; i--; )
     gcMARK2(pac->msgs[i], gc);
 
diff --git a/src/racket/src/places.c b/src/racket/src/places.c
index cbd79e7869..6d4e8aa7be 100644
--- a/src/racket/src/places.c
+++ b/src/racket/src/places.c
@@ -1194,7 +1194,7 @@ Scheme_Object *scheme_place_recv(int argc, Scheme_Object *args[]) {
       scheme_wrong_type("place-channel-recv", "place-channel", 0, argc, args);
     }
     {
-      void *msg_memory;
+      void *msg_memory = NULL;
       mso = scheme_place_async_recv((Scheme_Place_Async_Channel *) ch->recvch, &msg_memory);
       return scheme_places_deserialize(mso, msg_memory);
     }