Merge from mozilla-central.

2012-09-05 16:18:11 -07:00
parent a5e0637e34 2674182a3d
commit 34c2353ac6
1634 changed files with 23814 additions and 11550 deletions
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -595,7 +595,7 @@ GetIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleValue
            if (!bytes)
                return false;
            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_NOT_ITERABLE, bytes);
-            cx->free_(bytes);
+            js_free(bytes);
            return false;
        }