Merge branch 'master' of git://git.netsurf-browser.org/netsurf

This commit is contained in:
Chris Young 2012-09-09 19:47:31 +01:00
commit f8b2e22332
2 changed files with 13 additions and 5 deletions

View File

@ -200,9 +200,6 @@ struct form_control *form_new_control(void *node, form_control_type type)
control->node = node;
control->type = type;
/* Default max length of input to something insane */
control->maxlength = UINT_MAX;
return control;
}

View File

@ -332,10 +332,21 @@ parse_input_element(struct form *forms, dom_html_input_element *input)
if (control->type == GADGET_PASSWORD ||
control->type == GADGET_TEXTBOX) {
unsigned long maxlength;
long maxlength;
if (dom_html_input_element_get_max_length(
input, &maxlength) == DOM_NO_ERR) {
input, &maxlength) != DOM_NO_ERR) {
maxlength = -1;
}
if (maxlength >= 0) {
/* Got valid maxlength */
control->maxlength = maxlength;
} else {
/* Input has no maxlength attr, or
* dom_html_input_element_get_max_length failed.
*
* Set it to something insane. */
control->maxlength = UINT_MAX;
}
}