Skip to content

Commit a1ec259

Browse files
Fix invalid array termination for null and undefined (#38)
* Add test case to check invalid terminator * Fix invalid array termination
1 parent 04dc4ad commit a1ec259

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: IntegrationTests/TestSuites/Sources/PrimaryTests/main.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ test("Array Iterator") {
8888
let prop_4 = getJSValue(this: globalObject1Ref, name: "prop_4")
8989
let array = try expectArray(prop_4)
9090
let expectedProp_4: [JSValue] = [
91-
.number(3), .number(4), .string("str_elm_1"), .number(5),
91+
.number(3), .number(4), .string("str_elm_1"), .null, .undefined, .number(5),
9292
]
9393
try expectEqual(Array(array), expectedProp_4)
9494
}

Diff for: IntegrationTests/bin/primary-tests.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ global.globalObject1 = {
55
"prop_2": 2,
66
"prop_3": true,
77
"prop_4": [
8-
3, 4, "str_elm_1", 5,
8+
3, 4, "str_elm_1", null, undefined, 5,
99
],
1010
"prop_5": {
1111
"func1": function () { return },
@@ -41,4 +41,4 @@ const { startWasiTask } = require("../lib")
4141

4242
startWasiTask("./dist/PrimaryTests.wasm").catch(err => {
4343
console.log(err)
44-
});
44+
});

Diff for: Sources/JavaScriptKit/JSArrayRef.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ extension JSArrayRef: RandomAccessCollection {
3434
return nil
3535
}
3636
let value = ref[index]
37-
return value.isNull ? nil : value
37+
return value
3838
}
3939
}
4040

0 commit comments

Comments
 (0)