Skip to content

Commit 3235652

Browse files
LiedtkeV8-internal LUCI CQ
authored andcommitted
[wasm] Fix serialization of WasmBeginCatch
The issue was introduced with commit 7fb8254 While I was running the fuzzer for multiple hours, the fuzzer is more persmissive in not crashing on invalid programs send over the wire, so this wasn't detected. Change-Id: I34f04902915539cb688c5c6eb6825d28a123ccb0 Reviewed-on: https://chrome-internal-review.googlesource.com/c/v8/fuzzilli/+/9130176 Reviewed-by: Michael Achenbach <machenbach@google.com> Commit-Queue: Michael Achenbach <machenbach@google.com> Auto-Submit: Matthias Liedtke <mliedtke@google.com> Reviewed-by: Olivier Flückiger <olivf@google.com>
1 parent 7fb8254 commit 3235652

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Sources/Fuzzilli/FuzzIL/Instruction.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2532,7 +2532,7 @@ extension Instruction: ProtobufConvertible {
25322532
}
25332533

25342534
guard op.numInputs + op.numOutputs + op.numInnerOutputs == inouts.count else {
2535-
throw FuzzilliError.instructionDecodingError("incorrect number of in- and outputs")
2535+
throw FuzzilliError.instructionDecodingError("incorrect number of in- and outputs for operation \(op)")
25362536
}
25372537

25382538
opCache?.add(op)

Sources/Fuzzilli/FuzzIL/WasmOperations.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ final class WasmBeginCatch : WasmOperation {
14211421
requiredContext: [.wasmFunction])
14221422
}
14231423

1424-
var blockOutputCount: Int {numInputs - 2}
1424+
var blockOutputCount: Int {numInputs - 3}
14251425
var labelParameterCount: Int {numInnerOutputs - 2}
14261426
}
14271427

0 commit comments

Comments
 (0)