Bug 906372 - Fix NULL deref when finishing off thread parse tasks which failed, r=billm.

This commit is contained in:
Brian Hackett 2013-08-17 21:29:30 -06:00
Родитель 58194c732e
Коммит 99a8e9e1c5
3 изменённых файлов: 3 добавлений и 4 удалений

Просмотреть файл

@ -4893,7 +4893,7 @@ JS::FinishOffThreadScript(JSRuntime *rt, JSScript *script)
{
#if defined(JS_THREADSAFE) && defined(JS_ION)
JS_ASSERT(CurrentThreadCanAccessRuntime(rt));
rt->workerThreadState->finishParseTaskForScript(script);
rt->workerThreadState->finishParseTaskForScript(rt, script);
#else
MOZ_ASSUME_UNREACHABLE("Off thread compilation is only available with JS_ION");
#endif

Просмотреть файл

@ -481,9 +481,8 @@ WorkerThreadState::canStartParseTask()
}
void
WorkerThreadState::finishParseTaskForScript(JSScript *script)
WorkerThreadState::finishParseTaskForScript(JSRuntime *rt, JSScript *script)
{
JSRuntime *rt = script->compartment()->runtimeFromMainThread();
ParseTask *parseTask = NULL;
{

Просмотреть файл

@ -115,7 +115,7 @@ class WorkerThreadState
return asmJSFailedFunction;
}
void finishParseTaskForScript(JSScript *script);
void finishParseTaskForScript(JSRuntime *rt, JSScript *script);
private: