summaryrefslogtreecommitdiff
path: root/content/handlers/html
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2019-08-03 14:25:14 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2019-08-03 14:27:44 +0100
commit182c4ddefe6c1cd050361febb344ccd8cd5d1c96 (patch)
tree66c7996e811fa5f3bb612aaf84ff1a4ba80b0cfb /content/handlers/html
parent54daff0e979a17984d66b06db2adc292f55b7b14 (diff)
downloadnetsurf-182c4ddefe6c1cd050361febb344ccd8cd5d1c96.tar.gz
netsurf-182c4ddefe6c1cd050361febb344ccd8cd5d1c96.tar.bz2
box_construct: Check error return from dom_has_attribute
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'content/handlers/html')
-rw-r--r--content/handlers/html/box_construct.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/content/handlers/html/box_construct.c b/content/handlers/html/box_construct.c
index 4d0cba748..a0eb69ed5 100644
--- a/content/handlers/html/box_construct.c
+++ b/content/handlers/html/box_construct.c
@@ -2229,8 +2229,13 @@ bool box_create_frameset(struct content_html_frames *f, dom_node *n,
dom_string_unref(s);
}
- dom_element_has_attribute(c, corestring_dom_noresize,
- &frame->no_resize);
+ if (dom_element_has_attribute(c, corestring_dom_noresize,
+ &frame->no_resize) != DOM_NO_ERR) {
+ /* If we can't read the attribute for some reason,
+ * assume we didn't have it.
+ */
+ frame->no_resize = false;
+ }
err = dom_element_get_attribute(c, corestring_dom_frameborder,
&s);
@@ -2849,7 +2854,10 @@ bool box_select_add_option(struct form_control *control, dom_node *n)
if (value == NULL)
goto no_memory;
- dom_element_has_attribute(n, corestring_dom_selected, &selected);
+ if (dom_element_has_attribute(n, corestring_dom_selected, &selected) != DOM_NO_ERR) {
+ /* Assume not selected if we can't read the attribute presence */
+ selected = false;
+ }
/* replace spaces/TABs with hard spaces to prevent line wrapping */
text_nowrap = cnv_space2nbsp(text);