2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a36dcec..d734c6a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2012-01-11  Kaz Kylheku  <kaz@kylheku.com>
 
+	Before releasing 53, there is this.
+
+	* eval.c (c_var_mark): Bugfix: we cannot use cptr_get from
+	within the garbage collector because of its type check.
+	Bugfix: synchronize the shadow binding with the variable's
+	current contents so we don't hang on to a stale object.
+
+2012-01-11  Kaz Kylheku  <kaz@kylheku.com>
+
 	Version 53
 
 	* txr.c (version): Bumped.
diff --git a/eval.c b/eval.c
index e6393122..b721dab7 100644
--- a/eval.c
+++ b/eval.c
@@ -1443,7 +1443,8 @@ static void reg_fun(val sym, val fun)
 
 static void c_var_mark(val obj)
 {
-  struct c_var *cv = (struct c_var *) cptr_get(obj);
+  struct c_var *cv = (struct c_var *) obj->co.handle;
+  cv->bind->c.cdr = *cv->loc; /* synchronize shadow binding with variable */
   gc_mark(cv->bind);
   /* we don't mark *loc since it should be a gc-protected C global! */
 }