From 0984b8ed0876f9c7046964b000a8bb27f2587b14 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Fri, 16 Apr 2021 15:12:46 +0400 Subject: [PATCH] MDEV-25420 JSON_TABLE: ASAN heap-buffer-overflow in Protocol::net_store_data or consequent failures. error in the patch fixed. --- sql/sql_select.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f65ddef408a..f57e5963cf8 100644 --- 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; }