Bug#31451475 UBSAN ERROR IN I_JSON.ARRAY_INDEX-BUG31152942.

Sergey Glukhov · dahlerlend · commit da087b136c8d · 2020-06-16T15:50:50.000+02:00
Fixed ubsan failures due to wrong typecasting.

Reviewed-by: Tor Didriksen &lt;tor.didriksen@oracle.com&gt;
Change-Id: I2fe29046260bcbc596fed555f0b521456c12271c
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
@@ -646,6 +646,7 @@ Copy_field::Copy_func *Copy_field::get_copy_func(bool save) {
     else
       return do_save_blob;
   }
+  if (m_to_field->is_array() && m_from_field->is_array()) return do_save_blob;
 
   bool compatible_db_low_byte_first =
       (m_to_field->table->s->db_low_byte_first ==
diff --git a/storage/temptable/src/column.cc b/storage/temptable/src/column.cc
@@ -52,7 +52,7 @@ Column::Column(const unsigned char *mysql_row,
 
   size_t data_offset;
 
-  m_is_blob = mysql_field.is_flag_set(BLOB_FLAG);
+  m_is_blob = (mysql_field.is_flag_set(BLOB_FLAG) || mysql_field.is_array());
 
   if (m_is_blob) {
     auto &blob_field = static_cast<const Field_blob &>(mysql_field);

Original file line number	Diff line number	Diff line change
`@@ -646,6 +646,7 @@ Copy_field::Copy_func *Copy_field::get_copy_func(bool save) {`
`646`	`646`	`else`
`647`	`647`	`return do_save_blob;`
`648`	`648`	`}`
	`649`	`+ if (m_to_field->is_array() && m_from_field->is_array()) return do_save_blob;`
`649`	`650`
`650`	`651`	`bool compatible_db_low_byte_first =`
`651`	`652`	`(m_to_field->table->s->db_low_byte_first ==`