MDEV-25420 JSON_TABLE: ASAN heap-buffer-overflow in Protocol::net_store_data or consequent failures.

Alexey Botchkov · Alexey Botchkov · commit 0984b8ed0876 · 2021-04-21T10:21:48.000+04:00
error in the patch fixed.
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
@@ -18293,10 +18293,10 @@ Create_tmp_table::Create_tmp_table(ORDER *group, bool distinct,
 
 static void add_null_bits_for_field(const Field *f, uint *null_counter)
 {
-  if (!f->flags & NOT_NULL_FLAG)
+  if (!(f->flags & NOT_NULL_FLAG))
     (*null_counter)++;
 
-  if (f->type() != MYSQL_TYPE_BIT)
+  if (f->type() == MYSQL_TYPE_BIT)
    (*null_counter)+= f->field_length & 7;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -18293,10 +18293,10 @@ Create_tmp_table::Create_tmp_table(ORDER *group, bool distinct,`
`18293`	`18293`
`18294`	`18294`	`static void add_null_bits_for_field(const Field f, uint null_counter)`
`18295`	`18295`	`{`
`18296`		`- if (!f->flags & NOT_NULL_FLAG)`
	`18296`	`+ if (!(f->flags & NOT_NULL_FLAG))`
`18297`	`18297`	`(*null_counter)++;`
`18298`	`18298`
`18299`		`- if (f->type() != MYSQL_TYPE_BIT)`
	`18299`	`+ if (f->type() == MYSQL_TYPE_BIT)`
`18300`	`18300`	`(*null_counter)+= f->field_length & 7;`
`18301`	`18301`	`}`
`18302`	`18302`