summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2021-09-15 16:06:02 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-02-10 14:36:25 +0100
commit0168d1eda30dad4b517659422e347175eb89e923 (patch)
treebc1935465b6427056eb3c9856f797525e0f667d5 /sql/sql_base.cc
parentad1fb06982d70c7ef61ac792f9dab7eae0e4abf8 (diff)
downloadmariadb-git-0168d1eda30dad4b517659422e347175eb89e923.tar.gz
MDEV-25766 Unused CTE lead to a crash in find_field_in_tables/find_order_in_list
Do not assume that subquery Item always present.
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 248dedf36e4..a6c07600591 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -6011,9 +6011,10 @@ find_field_in_tables(THD *thd, Item_ident *item,
sl=sl->outer_select())
{
Item *subs= sl->master_unit()->item;
- if (subs->type() == Item::SUBSELECT_ITEM &&
- ((Item_subselect*)subs)->substype() == Item_subselect::IN_SUBS &&
- ((Item_in_subselect*)subs)->test_strategy(SUBS_SEMI_JOIN))
+ if (!subs ||
+ (subs->type() == Item::SUBSELECT_ITEM &&
+ ((Item_subselect*)subs)->substype() == Item_subselect::IN_SUBS &&
+ ((Item_in_subselect*)subs)->test_strategy(SUBS_SEMI_JOIN)))
{
continue;
}