summaryrefslogtreecommitdiff
path: root/desktop/browser.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2015-08-13 12:23:59 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2015-08-13 12:23:59 +0100
commit16fd36eb9d13a71deba2d7a737efa16e1f953138 (patch)
tree41aabec842296aecf820d3b2cfcd64060357c150 /desktop/browser.c
parentc7a32294940c54294b96c0d0d789e0cffb1c03b3 (diff)
downloadnetsurf-16fd36eb9d13a71deba2d7a737efa16e1f953138.tar.gz
netsurf-16fd36eb9d13a71deba2d7a737efa16e1f953138.tar.bz2
Proper error handling for JS context creation.
Diffstat (limited to 'desktop/browser.c')
-rw-r--r--desktop/browser.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 18c7fa247..21b6c8815 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -854,11 +854,10 @@ nserror browser_window_initialise_common(enum browser_window_create_flags flags,
assert(bw);
/* new javascript context for each window/(i)frame */
- bw->jsctx = js_newcontext(nsoption_int(script_timeout),
- slow_script,
- NULL);
- /* If bw->jsctx == NULL, it might be because we built with no JS.
- * TODO: Error handling in the with JS case. */
+ err = js_newcontext(nsoption_int(script_timeout),
+ slow_script, NULL, &bw->jsctx);
+ if (err != NSERROR_OK)
+ return err;
if (flags & BW_CREATE_CLONE) {
assert(existing != NULL);