aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-10-28 04:53:07 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-10-28 04:53:07 +0000
commit1cf8872ba15eeee7cddbbb74e3b93c647d597a5b (patch)
tree6673239782b01ff9313a76bfa6d0fd6b0f8e066e
parent[w3m-dev-en 00796] (diff)
downloadw3m-1cf8872ba15eeee7cddbbb74e3b93c647d597a5b.tar.gz
w3m-1cf8872ba15eeee7cddbbb74e3b93c647d597a5b.zip
[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 (limited to '')
-rw-r--r--ChangeLog7
-rw-r--r--table.c11
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e48824..9a72771 100644
--- 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]
@@ -4004,4 +4009,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.453 2002/10/27 17:16:36 ukai Exp $
+$Id: ChangeLog,v 1.454 2002/10/28 04:53:07 ukai Exp $
diff --git a/table.c b/table.c
index 357b1d1..4f80ab6 100644
--- a/table.c
+++ b/table.c
@@ -1,4 +1,4 @@
-/* $Id: table.c,v 1.25 2002/10/10 16:59:33 ukai Exp $ */
+/* $Id: table.c,v 1.26 2002/10/28 04:53:07 ukai Exp $ */
/*
* HTML table
*/
@@ -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;
}