Merge mozilla-central to tracemonkey.

This commit is contained in:
Robert Sayre
2010-07-20 15:07:03 -07:00
1753 changed files with 106286 additions and 36260 deletions

View File

@@ -501,11 +501,11 @@ ObjectWrapperChild::AnswerNewEnumerateNext(const JSVariant& in_state,
if (!strIds || !JS_GetReservedSlot(cx, state, sNextIdIndexSlot, &v))
return false;
jsint i = JSVAL_TO_INT(v);
jsuint i = JSVAL_TO_INT(v);
NS_ASSERTION(i >= 0, "Index of next jsid negative?");
NS_ASSERTION(i <= strIds->Length(), "Index of next jsid too large?");
if (i == strIds->Length()) {
if (jsuint(i) == strIds->Length()) {
*status = JS_TRUE;
return JSObject_to_JSVariant(cx, NULL, statep);
}