MDEV-39540 crash due to narrowing cast in update_ref_and_keys()

vuvova · vuvova · commit 32327e572bbd · 2026-05-06T13:28:33.000+02:00
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
@@ -7328,7 +7328,7 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab,
 {
   uint	and_level,i;
   KEY_FIELD *key_fields, *end, *field;
-  uint sz;
+  size_t sz;
   uint m= MY_MAX(select_lex->max_equal_elems,1);
   DBUG_ENTER("update_ref_and_keys");
   DBUG_PRINT("enter", ("normal_tables: %llx", normal_tables));

Original file line number	Diff line number	Diff line change
`@@ -7328,7 +7328,7 @@ update_ref_and_keys(THD thd, DYNAMIC_ARRAY keyuse,JOIN_TAB *join_tab,`
`7328`	`7328`	`{`
`7329`	`7329`	`uint and_level,i;`
`7330`	`7330`	`KEY_FIELD key_fields, end, *field;`
`7331`		`- uint sz;`
	`7331`	`+ size_t sz;`
`7332`	`7332`	`uint m= MY_MAX(select_lex->max_equal_elems,1);`
`7333`	`7333`	`DBUG_ENTER("update_ref_and_keys");`
`7334`	`7334`	`DBUG_PRINT("enter", ("normal_tables: %llx", normal_tables));`