From c54e460702bef353a53cee8a273f1fb04595c8d4 Mon Sep 17 00:00:00 2001 From: Andreas Gal Date: Fri, 23 Jul 2010 16:05:36 -0700 Subject: [PATCH] Remove leftover use of js_NewArrayObjectWithCapacity (follow-up for bug 581264). --- js/src/ctypes/CTypes.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp index f623dbc770cb..e2e3da13882f 100644 --- a/js/src/ctypes/CTypes.cpp +++ b/js/src/ctypes/CTypes.cpp @@ -5038,17 +5038,17 @@ FunctionType::ArgTypesGetter(JSContext* cx, JSObject* obj, jsid idval, jsval* vp size_t len = fninfo->mArgTypes.length(); // Prepare a new array. - jsval* vec; - JSObject* argTypes = - js_NewArrayObjectWithCapacity(cx, len, &vec); - if (!argTypes) + Array vec; + if (!vec.resize(len)) return JS_FALSE; - js::AutoObjectRooter argsroot(cx, argTypes); - JS_ASSERT(len == 0 || vec); for (size_t i = 0; i < len; ++i) vec[i] = OBJECT_TO_JSVAL(fninfo->mArgTypes[i]); + JSObject* argTypes = JS_NewArrayObject(cx, len, vec.begin()); + if (!argTypes) + return JS_FALSE; + // Seal and cache it. if (!JS_SealObject(cx, argTypes, JS_FALSE) || !JS_SetReservedSlot(cx, obj, SLOT_ARGS_T, OBJECT_TO_JSVAL(argTypes)))