summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--render/html.c9
-rw-r--r--utils/nsurl.c4
2 files changed, 7 insertions, 6 deletions
diff --git a/render/html.c b/render/html.c
index f6e3fda56..6c6dcdfca 100644
--- a/render/html.c
+++ b/render/html.c
@@ -2622,9 +2622,12 @@ html_get_contextual_content(struct content *c,
if (box->usemap) {
const char *target = NULL;
- data->link_url = nsurl_access(imagemap_get(html,
- box->usemap, box_x, box_y, x, y,
- &target));
+ nsurl *url = imagemap_get(html, box->usemap, box_x,
+ box_y, x, y, &target);
+ /* Box might have imagemap, but no actual link area
+ * at point */
+ if (url != NULL)
+ data->link_url = nsurl_access(url);
}
if (box->gadget) {
switch (box->gadget->type) {
diff --git a/utils/nsurl.c b/utils/nsurl.c
index eeaf202a7..18577b65d 100644
--- a/utils/nsurl.c
+++ b/utils/nsurl.c
@@ -1564,9 +1564,7 @@ bool nsurl_has_component(const nsurl *url, nsurl_component part)
/* exported interface, documented in nsurl.h */
const char *nsurl_access(const nsurl *url)
{
- if (url == NULL) {
- return NULL;
- }
+ assert(url != NULL);
return url->string;
}