Skip to content

Commit

Permalink
Fixes array oob on reassignment.
Browse files Browse the repository at this point in the history
When using literal on array reasignement we were not checking the array length.
We now throw an array oob error in this case.

Fixes #6393
  • Loading branch information
esdrubal committed Jan 7, 2025
1 parent a02e8ea commit 73ff74d
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 2 deletions.
19 changes: 17 additions & 2 deletions sway-core/src/semantic_analysis/namespace/lexical_scope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -941,12 +941,27 @@ impl Items {
full_span_for_error = Span::join(full_span_for_error, index_span);
}
(
TypeInfo::Array(elem_ty, _),
ty::ProjectionKind::ArrayIndex { index_span, .. },
TypeInfo::Array(elem_ty, array_length),
ty::ProjectionKind::ArrayIndex { index, index_span },
) => {
parent_rover = symbol;
symbol = elem_ty.type_id;
symbol_span = index_span.clone();

if let Some(index_literal) = index
.expression
.as_literal()
.and_then(|x| x.cast_value_to_u64())
{
if index_literal >= array_length.val() as u64 {
return Err(handler.emit_err(CompileError::ArrayOutOfBounds {
index: index_literal,
count: array_length.val() as u64,
span: index.span.clone(),
}));
}
}

// `index_span` does not contain the enclosing square brackets.
// Which means, if this array index access is the last one before the
// erroneous expression, the `full_span_for_error` will be missing the
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[[package]]
name = "array_oob_reassignment"
source = "member"
dependencies = ["core"]

[[package]]
name = "core"
source = "path+from-root-CC73096846C1E083"
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[project]
authors = ["Fuel Labs <[email protected]>"]
license = "Apache-2.0"
name = "array_oob_reassignment"
entry = "main.sw"
implicit-std = false

[dependencies]
core = { path = "../../../../../../sway-lib-core" }
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
script;

fn main() {
let mut a = [u64; 0];
a[0] = 1;


let mut b = [[u64; 1]; 1];
b[0][1] = 1;


b[1][0] = 1;


a[0] = return;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
category = "fail"

# check: $()let mut a = [u64; 0];
# nextln: $()This declaration is never used.

# check: $()let mut b = [[u64; 1]; 1];
# nextln: $()This declaration is never used.

# check: $()a[0] = 1;
# nextln: $()Index out of bounds; the length is 0 but the index is 0.

# check: $()b[0][1] = 1;
# nextln: $()Index out of bounds; the length is 1 but the index is 1.

# check: $()b[1][0] = 1;
# nextln: $()Index out of bounds; the length is 1 but the index is 1.

# check: $()a[0] = return;
# nextln: $()Index out of bounds; the length is 0 but the index is 0.

0 comments on commit 73ff74d

Please sign in to comment.