From 52700ad3cb5315345f9513b5c877cf127b9c1d4a Mon Sep 17 00:00:00 2001 From: James Bursa Date: Tue, 11 May 2004 16:40:12 +0000 Subject: [project @ 2004-05-11 16:40:12 by bursa] Ignore negative colspan. svn path=/import/netsurf/; revision=851 --- render/box.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/render/box.c b/render/box.c index e5c856978..d1ef50d48 100644 --- a/render/box.c +++ b/render/box.c @@ -316,7 +316,7 @@ struct box * convert_xml_to_box(xmlNode * n, struct content *content, /* extract title attribute, if present */ if ((title0 = xmlGetProp(n, (const xmlChar *) "title"))) { status.title = title = squash_tolat1(title0); - xfree(title0); + xmlFree(title0); } /* special elements */ @@ -520,8 +520,9 @@ struct box * convert_xml_to_box(xmlNode * n, struct content *content, inline_container = 0; if ((s = (char *) xmlGetProp(n, (const xmlChar *) "colspan"))) { - if ((box->columns = strtol(s, 0, 10)) == 0) - box->columns = 1; + int colspan = atoi(s); + if (1 <= colspan && colspan <= 100) + box->columns = colspan; xmlFree(s); } if ((s = (char *) xmlGetProp(n, (const xmlChar *) "rowspan"))) { -- cgit v1.2.3