w3m

commit bfe15153a60f8f1b49e87c7dcb765ffa2c2962d9
parent d863b461a04ad945ba4e134f85978e9b678996c6
Author: ukai <ukai>
Date:   Mon, 28 Oct 2002 04:53:07 +0000

[w3m-dev 03351] w3m core dump
* table.c (feed_table_tag): fix rendering problem (maybe security hole?)
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
5
+++++
M
table.c
 | 
9
+++++----

2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-28  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03351] w3m core dump
+	* table.c (feed_table_tag): fix rendering problem (maybe security hole?)
+
 2002-10-28  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* [w3m-dev-en 00796]
diff --git a/table.c b/table.c
@@ -2679,10 +2679,11 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
 #if 0
 		tbl->tabattr[tbl->row + i][tbl->col + j] &= ~(HTT_X | HTT_Y);
 #endif
-		if (tbl->tabattr[tbl->row + i][tbl->col + j] & (HTT_X | HTT_Y))
-		    break;
-		tbl->tabattr[tbl->row + i][tbl->col + j] |=
-		    ((i > 0) ? HTT_Y : 0) | ((j > 0) ? HTT_X : 0);
+		if (! (tbl->tabattr[tbl->row + i][tbl->col + j] &
+			(HTT_X | HTT_Y))) {
+		    tbl->tabattr[tbl->row + i][tbl->col + j] |=
+			((i > 0) ? HTT_Y : 0) | ((j > 0) ? HTT_X : 0);
+		}
 		if (tbl->col + j > tbl->maxcol) {
 		    tbl->maxcol = tbl->col + j;
 		}