Skip to content

Commit 7ccca45

Browse files
Merge pull request #356 from swiftwasm/yt/fix-nullptr-write
Fix null-ptr write with `pthread_create`
2 parents e069230 + 50cfddc commit 7ccca45

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,9 @@ public final class WebWorkerTaskExecutor: TaskExecutor {
412412
let unmanagedContext = Unmanaged.passRetained(context)
413413
contexts.append(unmanagedContext)
414414
let ptr = unmanagedContext.toOpaque()
415+
var thread = pthread_t(bitPattern: 0)
415416
let ret = pthread_create(
416-
nil,
417+
&thread,
417418
nil,
418419
{ ptr in
419420
// Cast to a optional pointer to absorb nullability variations between platforms.

Tests/JavaScriptEventLoopTests/JavaScriptEventLoopTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ final class JavaScriptEventLoopTests: XCTestCase {
157157
let result = try await promise2.value
158158
XCTAssertEqual(result, .string("3.0"))
159159
}
160-
XCTAssertGreaterThanOrEqual(thenDiff, 200)
160+
XCTAssertGreaterThanOrEqual(thenDiff, 150)
161161
}
162162

163163
func testPromiseThenWithFailure() async throws {

0 commit comments

Comments
 (0)