diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2014-09-25 09:50:24 +0100 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-09-25 09:50:24 +0100 |
commit | c9bf72a4a30da996fc84ee6df8416a3e929ad28f (patch) | |
tree | 77a5bc35378ef3ac1170d66809dd32a47a18318c | |
parent | e825f384370ec0c939f5b2c8d741b796b3eb98e9 (diff) | |
download | netsurf-c9bf72a4a30da996fc84ee6df8416a3e929ad28f.tar.gz netsurf-c9bf72a4a30da996fc84ee6df8416a3e929ad28f.tar.bz2 |
Stop invalid background image URL from preventing page load.
Stops url(http://) from causing page load to fail with warning
message of "boxconvert".
-rw-r--r-- | render/box_construct.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/render/box_construct.c b/render/box_construct.c index 17cb3306d..9759d7434 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -930,7 +930,7 @@ bool box_construct_element(struct box_construct_ctx *ctx, /* Kick off fetch for any background image */ if (css_computed_background_image(box->style, &bgimage_uri) == CSS_BACKGROUND_IMAGE_IMAGE && bgimage_uri != NULL && - nsoption_bool(background_images) == true) { + nsoption_bool(background_images) == true) { nsurl *url; nserror error; @@ -939,16 +939,17 @@ bool box_construct_element(struct box_construct_ctx *ctx, * nsurl_joined it. Can this be improved? * For now, just making another nsurl. */ error = nsurl_create(lwc_string_data(bgimage_uri), &url); - if (error != NSERROR_OK) - return false; - - if (html_fetch_object(ctx->content, url, box, image_types, - ctx->content->base.available_width, 1000, - true) == false) { + if (error == NSERROR_OK) { + /* Fetch image if we got a valid URL */ + if (html_fetch_object(ctx->content, url, box, + image_types, + ctx->content->base.available_width, + 1000, true) == false) { + nsurl_unref(url); + return false; + } nsurl_unref(url); - return false; } - nsurl_unref(url); } if (*convert_children) |