From 514a9a7906bce41955ac58e624600444a2d6c194 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Wed, 15 Jan 2025 01:49:58 +0800
Subject: [PATCH] cgen: fix assigning option of array index (fix #23451)
 (#23455)

---
 vlib/v/gen/c/cgen.v                                     | 6 ++++++
 vlib/v/gen/c/index.v                                    | 6 +++++-
 vlib/v/tests/assign/assign_option_of_array_index_test.v | 9 +++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 vlib/v/tests/assign/assign_option_of_array_index_test.v

diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
index db1cff0e8d..15bafadf80 100644
--- a/vlib/v/gen/c/cgen.v
+++ b/vlib/v/gen/c/cgen.v
@@ -6718,6 +6718,12 @@ fn (mut g Gen) gen_or_block_stmts(cvar_name string, cast_typ string, stmts []ast
 								if expr_stmt.expr.is_return_used {
 									g.write('*(${cast_typ}*) ${cvar_name}.data = ')
 								}
+							} else if g.inside_opt_or_res && return_is_option && g.inside_assign {
+								g.write('_option_ok(&(${cast_typ}[]) { ')
+								g.expr_with_cast(expr_stmt.expr, expr_stmt.typ, return_type.clear_option_and_result())
+								g.writeln(' }, (${option_name}*)&${cvar_name}, sizeof(${cast_typ}));')
+								g.indent--
+								return
 							} else {
 								g.write('*(${cast_typ}*) ${cvar_name}.data = ')
 							}
diff --git a/vlib/v/gen/c/index.v b/vlib/v/gen/c/index.v
index eea326994e..d990a97cdc 100644
--- a/vlib/v/gen/c/index.v
+++ b/vlib/v/gen/c/index.v
@@ -342,7 +342,11 @@ fn (mut g Gen) index_of_array(node ast.IndexExpr, sym ast.TypeSymbol) {
 				g.or_block(tmp_opt, node.or_expr, elem_type)
 			}
 			if !g.is_amp {
-				g.write('\n${cur_line}(*(${elem_type_str}*)${tmp_opt}.data)')
+				if g.inside_opt_or_res && elem_type.has_flag(.option) && g.inside_assign {
+					g.write('\n${cur_line}(*(${elem_type_str}*)&${tmp_opt})')
+				} else {
+					g.write('\n${cur_line}(*(${elem_type_str}*)${tmp_opt}.data)')
+				}
 			} else {
 				g.write('\n${cur_line}*${tmp_opt_ptr}')
 			}
diff --git a/vlib/v/tests/assign/assign_option_of_array_index_test.v b/vlib/v/tests/assign/assign_option_of_array_index_test.v
new file mode 100644
index 0000000000..cd4816adfa
--- /dev/null
+++ b/vlib/v/tests/assign/assign_option_of_array_index_test.v
@@ -0,0 +1,9 @@
+fn make_option() ?string {
+	return none
+}
+
+fn test_assign_option_of_array_index() {
+	arr := [make_option()]
+	unwrapped := arr[99] or { 'unknown' } // <- out of bounds access!
+	assert '${unwrapped}' == "Option('unknown')"
+}