Fix crash in tads on game quit caused by debug code inserting sentinels

before allocations but not adjusting for them in deallocation.
bfulgham · Jun 18, 2015 · e2a4e5c · e2a4e5c
1 parent c3eb0ef
commit e2a4e5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/tads/tads2/mcm.c b/tads/tads2/mcm.c
@@ -118,6 +118,8 @@ mcmcxdef *mcmcini(mcmcx1def *globalctx, uint pages,
 /* uninitialize a client context */
 void mcmcterm(mcmcxdef *ctx)
 {
+    IF_DEBUG(ctx = (mcmcxdef *)((uchar *)ctx - sizeof(ulong)));
+
     /* delete the context memory */
     mchfre(ctx);
 }
@@ -251,6 +253,8 @@ void mcmterm(mcmcx1def *ctx)
      *   allocated out of the block, so it's the same as the block pointer.
      *   Freeing the context frees this last/first chunk. 
      */
+    IF_DEBUG(ctx = (mcmcx1def *)((uchar *)ctx - sizeof(ulong)));
+
     mchfre(ctx);
 }
 

diff --git a/ui/RichTextView.m b/ui/RichTextView.m
@@ -581,7 +581,6 @@ - (void)setDelegate:(UIViewController<UIScrollViewDelegate>*)delegate {
 }
 
 -(void)dealloc {
-    NSLog(@"rtv %@ dealloc", self);
     if (m_selectionView) {
         [m_selectionView removeFromSuperview];
         m_selectionView = nil;