Skip to content

Translator: Fix stack depth check in checkBeforePop #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2024
Merged

Translator: Fix stack depth check in checkBeforePop #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added FuzzTesting/FailCases/FuzzTranslator/crash-2e61aac9dea72d2efe93489c1276ec1b69fb2992
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions Sources/WasmKit/Translator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,8 +900,8 @@ struct InstructionTranslator<Context: TranslatorContext>: InstructionVisitor {
///
/// - Parameter typeHint: A type expected to be popped. Only used for diagnostic purpose.
/// - Returns: `true` if check succeed. `false` if the pop operation is going to be performed in unreachable code path.
private func checkBeforePop(typeHint: ValueType?, controlFrame: ControlStack.ControlFrame) throws -> Bool {
if _slowPath(valueStack.height <= controlFrame.stackHeight) {
private func checkBeforePop(typeHint: ValueType?, depth: Int = 0, controlFrame: ControlStack.ControlFrame) throws -> Bool {
if _slowPath(valueStack.height - depth <= controlFrame.stackHeight) {
if controlFrame.reachable {
let message: String
if let typeHint {
Expand All @@ -916,9 +916,9 @@ struct InstructionTranslator<Context: TranslatorContext>: InstructionVisitor {
}
return true
}
private func checkBeforePop(typeHint: ValueType?) throws -> Bool {
private func checkBeforePop(typeHint: ValueType?, depth: Int = 0) throws -> Bool {
let controlFrame = try controlStack.currentFrame()
return try self.checkBeforePop(typeHint: typeHint, controlFrame: controlFrame)
return try self.checkBeforePop(typeHint: typeHint, depth: depth, controlFrame: controlFrame)
}
private mutating func ensureOnVReg(_ source: ValueSource) -> VReg {
// TODO: Copy to stack if source is on preg
Expand Down Expand Up @@ -994,7 +994,7 @@ struct InstructionTranslator<Context: TranslatorContext>: InstructionVisitor {

private func checkStackTop(_ valueTypes: [ValueType]) throws {
for (stackDepth, type) in valueTypes.reversed().enumerated() {
guard try checkBeforePop(typeHint: type) else { return }
guard try checkBeforePop(typeHint: type, depth: stackDepth) else { return }
let actual = valueStack.peekType(depth: stackDepth)
switch actual {
case .some(let actualType):
Expand Down