Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/react-native/ReactCommon/jsi/jsi/jsi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -460,13 +460,13 @@ void Runtime::deleteProperty(const Object& object, const Value& name) {
}

size_t Runtime::push(const Array& arr, const Value* elements, size_t count) {
size_t newSize = size(arr);
uint64_t newSize = size(arr);
for (size_t i = 0; i < count; i++) {
arr.setProperty(*this, Value((int)newSize), elements[i]);
arr.setProperty(*this, Value(static_cast<double>(newSize)), elements[i]);
++newSize;
}
arr.setProperty(*this, "length", Value((int)newSize));
return newSize;
arr.setProperty(*this, "length", Value(static_cast<double>(newSize)));
return static_cast<size_t>(newSize);
}

void Runtime::setRuntimeDataImpl(
Expand Down
16 changes: 16 additions & 0 deletions packages/react-native/ReactCommon/jsi/jsi/test/testlib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2557,6 +2557,22 @@ TEST_P(JSITest, ArrayPush) {
EXPECT_EQ(arr.getValueAtIndex(rd, 1).getNumber(), 2);
EXPECT_EQ(arr.getValueAtIndex(rd, 2).getNumber(), 3);
EXPECT_TRUE(arr.getValueAtIndex(rd, 3).isUndefined());

// Push to an array whose length doesn't fit in an int
arr =
eval("var a = []; a.length = 2147483648; a;").getObject(rd).getArray(rd);
EXPECT_NO_THROW(newLength = arr.push(rd, 1));
EXPECT_EQ(newLength, 2147483649);
EXPECT_EQ(arr.length(rd), 2147483649);
EXPECT_TRUE(Value::strictEquals(rd, arr.getProperty(rd, "2147483648"), 1));

// Push past the maximum array length. As in JS, the element is stored under
// the non-index key "4294967295", then setting 'length' throws a RangeError.
arr =
eval("var a = []; a.length = 4294967295; a;").getObject(rd).getArray(rd);
EXPECT_THROW(arr.push(rd, 1), JSError);
EXPECT_EQ(arr.length(rd), 4294967295);
EXPECT_TRUE(Value::strictEquals(rd, arr.getProperty(rd, "4294967295"), 1));
}

TEST_P(JSITest, UInt8ArrayTest) {
Expand Down
Loading