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: 7 additions & 1 deletion acvm-repo/brillig_vm/src/arithmetic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ pub(crate) fn evaluate_binary_field_op<F: AcirField>(
BinaryFieldOp::Add => MemoryValue::new_field(a + b),
BinaryFieldOp::Sub => MemoryValue::new_field(a - b),
BinaryFieldOp::Mul => MemoryValue::new_field(a * b),
BinaryFieldOp::Div => MemoryValue::new_field(a / b),
BinaryFieldOp::Div => {
if b.is_zero() {
return Err(BrilligArithmeticError::DivisionByZero);
} else {
MemoryValue::new_field(a / b)
}
}
BinaryFieldOp::IntegerDiv => {
if b.is_zero() {
return Err(BrilligArithmeticError::DivisionByZero);
Expand Down
41 changes: 41 additions & 0 deletions acvm-repo/brillig_vm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2406,4 +2406,45 @@ mod tests {

assert_eq!(output_value.to_field(), FieldElement::from(1u128));
}

#[test]
fn field_zero_division_regression() {
let calldata: Vec<FieldElement> = vec![];

let opcodes = &[
Opcode::Const {
destination: MemoryAddress::direct(0),
bit_size: BitSize::Field,
value: FieldElement::from(1u64),
},
Opcode::Const {
destination: MemoryAddress::direct(1),
bit_size: BitSize::Field,
value: FieldElement::from(0u64),
},
Opcode::BinaryFieldOp {
destination: MemoryAddress::direct(2),
op: BinaryFieldOp::Div,
lhs: MemoryAddress::direct(0),
rhs: MemoryAddress::direct(1),
},
];
let solver = StubbedBlackBoxSolver::default();
let mut vm = VM::new(calldata, opcodes, &solver, false);

let status = vm.process_opcode();
assert_eq!(status, VMStatus::InProgress);
let status = vm.process_opcode();
assert_eq!(status, VMStatus::InProgress);
let status = vm.process_opcode();
assert_eq!(
status,
VMStatus::Failure {
reason: FailureReason::RuntimeError {
message: "Attempted to divide by zero".into()
},
call_stack: vec![2]
}
);
}
}