diff options
Diffstat (limited to 'render/box_construct.c')
| -rw-r--r-- | render/box_construct.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/render/box_construct.c b/render/box_construct.c index b61cb5d24..d37d357c3 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -457,15 +457,19 @@ bool box_construct_element(xmlNode *n, struct content *content, /* misc. attributes that can't be handled in box_get_style() */ if ((s = (char *) xmlGetProp(n, (const xmlChar *) "colspan"))) { - box->columns = strtol(s, NULL, 10); - if (MAX_SPAN < box->columns) - box->columns = 1; + if (isdigit(s[0])) { + box->columns = strtol(s, NULL, 10); + if ((MAX_SPAN < box->columns) || (box->columns < 1)) + box->columns = 1; + } xmlFree(s); } if ((s = (char *) xmlGetProp(n, (const xmlChar *) "rowspan"))) { - box->rows = strtol(s, NULL, 10); - if (MAX_SPAN < box->rows) - box->rows = 1; + if (isdigit(s[0])) { + box->rows = strtol(s, NULL, 10); + if ((MAX_SPAN < box->rows) || (box->rows < 1)) + box->rows = 1; + } xmlFree(s); } if (strcmp((const char *) n->name, "table") == 0) { |