Bug 929065 - Fix an oom handling issue in ion compilation; r=bhackett

--HG--
extra : rebase_source : a2996447791b60ca53d02f7eb514143370c232b0
This commit is contained in:
Terrence Cole 2013-10-21 12:12:48 -07:00
parent 0c4c254822
commit 27ec37c90f
2 changed files with 5 additions and 1 deletions

View File

@ -1586,6 +1586,9 @@ IonCompile(JSContext *cx, JSScript *script,
return AbortReason_Alloc;
MIRGraph *graph = alloc->new_<MIRGraph>(temp);
if (!graph)
return AbortReason_Alloc;
CompileInfo *info = alloc->new_<CompileInfo>(script, script->function(), osrPc, constructing,
executionMode);
if (!info)

View File

@ -90,7 +90,8 @@ class IonAllocPolicy
}
void *calloc_(size_t bytes) {
void *p = GetIonContext()->temp->allocate(bytes);
memset(p, 0, bytes);
if (p)
memset(p, 0, bytes);
return p;
}
void *realloc_(void *p, size_t oldBytes, size_t bytes) {