summaryrefslogtreecommitdiff
path: root/sql/opt_range.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2016-06-20 14:11:01 +0400
committerAlexander Barkov <bar@mariadb.org>2016-06-20 14:11:01 +0400
commita80dbe068ca650ef1f4daee2263f0bc6e7aeb0e1 (patch)
tree0093e4ebd60835b8894cb00847799c030d0c6d20 /sql/opt_range.cc
parent70ad689b11bfbd8a30a777f4893a5384628c00e7 (diff)
downloadmariadb-git-a80dbe068ca650ef1f4daee2263f0bc6e7aeb0e1.tar.gz
MDEV-10020 InnoDB NOT IN Query Crash When One Item Is NULL
The problem was that the loop in get_func_mm_tree() accessed improperly initialized instances of String, which resided in the bzero'ed part of the in_vector::base array. Strings in in_vector::base are originally initialized in Item_func_in::fix_length_and_dec(), in in_vector::in_vector() using sql_calloc, rather than using a String constructor, so their str_charset members are originally equal to NULL. Strings in in_vector::base are later initialized to good values in Item_func_in::fix_length_and_dec(), using array->set(), in this code: uint j=0; for (uint i=1 ; i < arg_count ; i++) { array->set(j,args[i]); if (!args[i]->null_value) // Skip NULL values j++; else have_null= 1; } if ((array->used_count= j)) array->sort(); NULLs are not taken into account, so at the end array->used_count can be smaller than array->count. This patch fixes the loop in opt_range.cc, in get_func_mm_tree(), to access only properly initialized elements in in_vector::base, preventing access to its bzero'ed non-initialized tail.
Diffstat (limited to 'sql/opt_range.cc')
-rw-r--r--sql/opt_range.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index f051ed07a7e..ae5899d8de4 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -7730,7 +7730,7 @@ static SEL_TREE *get_func_mm_tree(RANGE_OPT_PARAM *param, Item_func *cond_func,
break;
}
SEL_TREE *tree2;
- for (; i < func->array->count; i++)
+ for (; i < func->array->used_count; i++)
{
if (func->array->compare_elems(i, i-1))
{