Bug 895220 - Do not OOM in AtomizeAndCopyChars if using NoGC; r=bhackett

2013-07-18 13:55:39 -07:00
parent 5e23d511db
commit 7320689f47
1 changed files with 2 additions and 1 deletions
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -312,7 +312,8 @@ AtomizeAndCopyChars(ExclusiveContext *cx, const jschar *tbchars, size_t length,

    if (!atoms.relookupOrAdd(p, AtomHasher::Lookup(tbchars, length),
                             AtomStateEntry(atom, bool(ib)))) {
-        js_ReportOutOfMemory(cx); /* SystemAllocPolicy does not report OOM. */
+        if (allowGC)
+            js_ReportOutOfMemory(cx); /* SystemAllocPolicy does not report OOM. */
        return NULL;
    }