aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Debian bug 534835: Check *_get_interpreter return values

Browse Source 
This should fix a crash in:

    at /home/Kalle/src/elinks-0.12/src/ecmascript/spidermonkey.c:251
    at /home/Kalle/src/elinks-0.12/src/ecmascript/ecmascript.c:104
    at /home/Kalle/src/elinks-0.12/src/viewer/text/vs.c:64

It seems that spidermonkey_get_interpreter failed and returned NULL to
ecmascript_get_interpreter, which did not check the return value and
behaved as if the ECMAScript interpreter had been properly initialized.
This caused destroy_vs to call ecmascript_put_interpreter, but
backend_data which should have been a JSContext * was NULL, causing
a crash in SpiderMonkey.

An alternative fix might be to make spidermonkey_put_interpreter skip
the JS_DestroyContext call if ctx is NULL.  However, I think it is
better to make sure ecmascript_get_interpreter returns NULL if
spidermonkey_get_interpreter fails, so that vs->ecmascript is left
NULL and there's no chance that some other code might try to
dereference the (JSContext *) NULL.
This commit is contained in:
Kalle Olavi Niemitalo 2009-06-28 00:18:05 +03:00 committed by Kalle Olavi Niemitalo
parent 10c07f9933
commit 11c0cb859b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ecmascript/ecmascript.c
View File

@ -80,11 +80,20 @@ ecmascript_get_interpreter(struct view_state *vs)
interpreter->vs = vs; interpreter->vs = vs;
interpreter->vs->ecmascript_fragile = 0; interpreter->vs->ecmascript_fragile = 0;
init_list(interpreter->onload_snippets); init_list(interpreter->onload_snippets);
/* The following backend call reads interpreter->vs. */
if (
#ifdef CONFIG_ECMASCRIPT_SEE #ifdef CONFIG_ECMASCRIPT_SEE
see_get_interpreter(interpreter); !see_get_interpreter(interpreter)
#else #else
spidermonkey_get_interpreter(interpreter); !spidermonkey_get_interpreter(interpreter)
#endif #endif
) {
/* Undo what was done above. */
interpreter->vs->ecmascript_fragile = 1;
mem_free(interpreter);
return NULL;
}
init_string(&interpreter->code); init_string(&interpreter->code);
return interpreter; return interpreter;
} }