storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/131993

Browse Source
This commit is contained in:
Ito Hiroyuki
2010-08-08 10:14:32 +00:00
parent 21b5491b78
commit 6ec43dc4b4
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+8 -1
View File
@@ -1,3 +1,10 @@
2010-08-08 Steven Harms <ZXB01226 at nifty.com>
* [w3m-dev 04371] Re: "important" bugs from bugs.debian.org
* https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/131993
* table.c (ATTR_ROWSPAN_MAX): added
(feed_table_tag): maximum value of rowspan is ATTR_ROWSPAN_MAX
2010-08-08 d+w3m@vdr.jp 2010-08-08 d+w3m@vdr.jp
* [w3m-dev 04360] Re: "important" bugs from bugs.debian.org * [w3m-dev 04360] Re: "important" bugs from bugs.debian.org
@@ -9116,4 +9123,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.1028 2010/08/08 09:53:42 htrb Exp $ $Id: ChangeLog,v 1.1029 2010/08/08 10:14:32 htrb Exp $
table.c
+8 -1
View File
@@ -1,4 +1,4 @@
/* $Id: table.c,v 1.56 2010/07/19 23:34:01 htrb Exp $ */ /* $Id: table.c,v 1.57 2010/08/08 10:14:32 htrb Exp $ */
/* /*
* HTML table * HTML table
*/ */
@@ -2408,6 +2408,8 @@ table_close_anchor0(struct table *tbl, struct table_mode *mode)
case HTML_N_COLGROUP:\ case HTML_N_COLGROUP:\
case HTML_COL case HTML_COL
#define ATTR_ROWSPAN_MAX 32766
static int static int
feed_table_tag(struct table *tbl, char *line, struct table_mode *mode, feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
int width, struct parsed_tag *tag) int width, struct parsed_tag *tag)
@@ -2592,6 +2594,11 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
else else
valign = HTT_MIDDLE; valign = HTT_MIDDLE;
if (parsedtag_get_value(tag, ATTR_ROWSPAN, &rowspan)) { if (parsedtag_get_value(tag, ATTR_ROWSPAN, &rowspan)) {
if(rowspan > ATTR_ROWSPAN_MAX)
{
fprintf(stderr, " Table Rowspan too large. Limiting to %d.\n", ATTR_ROWSPAN_MAX);
rowspan = ATTR_ROWSPAN_MAX;
}
if ((tbl->row + rowspan) >= tbl->max_rowsize) if ((tbl->row + rowspan) >= tbl->max_rowsize)
check_row(tbl, tbl->row + rowspan); check_row(tbl, tbl->row + rowspan);
} }