mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-28 09:13:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ignore junk values (fix 1444336)

Browse Source 
svn path=/trunk/netsurf/; revision=2715
This commit is contained in:
Richard Wilson 2006-07-05 00:21:04 +00:00
parent 307ae1c40c
commit cd59d27008
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
render/box_construct.c
View File

@ -806,8 +806,8 @@ struct css_style * box_get_style(struct content *c,
}
if ((s = (char *) xmlGetProp(n, (const xmlChar *) "height"))) {
float value = atof(s);
if (value < 0 || strlen(s) == 0) {
float value = isdigit(s[0]) ? atof(s) : -1;
if (value <= 0 || strlen(s) == 0) {
/* ignore negative values and height="" */
} else if (strrchr(s, '%')) {
/* the specification doesn't make clear what
@ -822,7 +822,7 @@ struct css_style * box_get_style(struct content *c,
if (strcmp((const char *) n->name, "input") == 0) {
if ((s = (char *) xmlGetProp(n, (const xmlChar *) "size"))) {
int size = atoi(s);
int size = isdigit(s[0]) ? atoi(s): -1;
if (0 < size) {
char *type = (char *) xmlGetProp(n,
(const xmlChar *) "type");
@ -859,7 +859,7 @@ struct css_style * box_get_style(struct content *c,
}
if ((s = (char *) xmlGetProp(n, (const xmlChar *) "width"))) {
float value = atof(s);
float value = isdigit(s[0]) ? atof(s) : -1;
if (value < 0 || strlen(s) == 0) {
/* ignore negative values and width="" */
} else if (strrchr(s, '%')) {
@ -875,7 +875,7 @@ struct css_style * box_get_style(struct content *c,
if (strcmp((const char *) n->name, "textarea") == 0) {
if ((s = (char *) xmlGetProp(n, (const xmlChar *) "rows"))) {
int value = atoi(s);
int value = isdigit(s[0]) ? atoi(s): -1;
if (0 < value) {
style->height.height = CSS_HEIGHT_LENGTH;
style->height.length.unit = CSS_UNIT_EM;
@ -884,7 +884,7 @@ struct css_style * box_get_style(struct content *c,
xmlFree(s);
}
if ((s = (char *) xmlGetProp(n, (const xmlChar *) "cols"))) {
int value = atoi(s);
int value = isdigit(s[0]) ? atoi(s): -1;
if (0 < value) {
style->width.width = CSS_WIDTH_LENGTH;
style->width.value.length.unit = CSS_UNIT_EX;
@ -898,7 +898,7 @@ struct css_style * box_get_style(struct content *c,
if ((s = (char *) xmlGetProp(n,
(const xmlChar *) "cellspacing"))) {
if (!strrchr(s, '%')) { /* % not implemented */
int value = atoi(s);
int value = isdigit(s[0]) ? atoi(s): -1;
if (0 <= value) {
style->border_spacing.border_spacing =
CSS_BORDER_SPACING_LENGTH;
@ -919,7 +919,7 @@ struct css_style * box_get_style(struct content *c,
if ((s = (char *) xmlGetProp(n,
(const xmlChar *) "hspace"))) {
if (!strrchr(s, '%')) { /* % not implemented */
int value = atoi(s);
int value = isdigit(s[0]) ? atoi(s): -1;
if (0 <= value) {
style->margin[LEFT].margin =
CSS_MARGIN_LENGTH;
@ -940,7 +940,7 @@ struct css_style * box_get_style(struct content *c,
if ((s = (char *) xmlGetProp(n,
(const xmlChar *) "vspace"))) {
if (!strrchr(s, '%')) { /* % not implemented */
int value = atoi(s);
int value = isdigit(s[0]) ? atoi(s): -1;
if (0 <= value) {
style->margin[TOP].margin =
CSS_MARGIN_LENGTH;