X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftab.c;h=3166740f2002645b4f3db15deb088a675ba077ad;hb=5382abe75bbd1689aca8c922fbf084af9f6bd723;hp=8672bd76be8378bbef60864b55d3de9a55684f09;hpb=63b39c9b76b2db4c9ac79050f256af8207802b7f;p=pspp

diff --git a/src/tab.c b/src/tab.c
index 8672bd76be..3166740f20 100644
--- a/src/tab.c
+++ b/src/tab.c
@@ -115,6 +115,7 @@ tab_destroy (struct tab_table *t)
 {
   assert (t != NULL);
   pool_destroy (t->container);
+  t=0;
 }
 
 /* Sets the width and height of a table, in columns and rows,
@@ -1339,8 +1340,7 @@ render_strip (int x, int y, int r, int c1, int c2, int r1 unused, int r2)
 		    {
 		      j->hit = tab_hit;
 
-		      if (j->x1 == c / 2 && j->y1 == r / 2
-			  && j->x2 <= c2 && j->y2 <= r2)
+		      if (j->x1 == c / 2 && j->y1 == r / 2)
 			{
 			  struct outp_text text;
 
@@ -1354,15 +1354,15 @@ render_strip (int x, int y, int r, int c1, int c2, int r1 unused, int r2)
 			    int c;
 
 			    for (c = j->x1, text.h = -t->wrv[j->x2];
-				 c < j->x2; c++)
-			      text.h += t->w[c] + t->wrv[c + 1];
+				 c < j->x2 && c < c2 / 2; c++) 
+                                text.h += t->w[c] + t->wrv[c + 1]; 
 			  }
 			  
 			  {
 			    int r;
 
 			    for (r = j->y1, text.v = -t->hrh[j->y2];
-				 r < j->y2; r++)
+				 r < j->y2 && r < r2 / 2; r++)
 			      text.v += t->h[r] + t->hrh[r + 1];
 			  }
 			  d->class->text_draw (d, &text);