mirror/Odin
1
0 Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-10-09 06:12:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent struct crashing from tuple expansion overflow

Browse Source
This commit is contained in:
Abderrahim Indjaren committed 2026-09-18 02:50:18 +01:00
1 parent 02c14865ad
commit 09c81c8a7f
1 file changed
+8 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.cpp
+8 -3
View File
@@ -10959,6 +10959,8 @@ gb_internal ExprKind check_compound_literal(CheckerContext *c, Operand *o, Ast *
Operand src_o = o;
src_o.type = src_field->type;
if (index + jj >= field_count)
continue ;
field = t->Struct.fields[index + (jj++)];
check_assignment(c, &src_o, field->type, str_lit("structure literal"));
@@ -10981,15 +10983,18 @@ gb_internal ExprKind check_compound_literal(CheckerContext *c, Operand *o, Ast *
handled_elem_count += 1;
}
if (handled_elem_count > field_count) {
error(o.expr, "Expansion overflows structure literal, expected %td, got %td", field_count, handled_elem_count);
break ;
}
}
if (cl->elems.count < field_count) {
if (min_field_count < field_count) {
if (cl->elems.count < min_field_count) {
error(cl->close, "Too few values in structure literal, expected at least %td, got %td", min_field_count, cl->elems.count);
error(cl->close, "Too few values in structure literal, expected at least %td, got %td", min_field_count, handled_elem_count);
}
} else if (handled_elem_count != field_count) {
error(cl->close, "Too few values in structure literal, expected %td, got %td", field_count, cl->elems.count);
error(cl->close, "Too few values in structure literal, expected %td, got %td", field_count, handled_elem_count);
}
}
}