diff options
author | Sergei Golubchik <serg@mariadb.org> | 2019-04-27 19:38:39 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-27 19:38:39 +0200 |
commit | d88dfd873232dafd480c2d0382b4ff3add9c936d (patch) | |
tree | e3d4627d79ca499d3c626e48f8c9f802004a9a4d /sql | |
parent | 3fe38574fbddd0594ac8ad8da10049a47cca6879 (diff) | |
download | mariadb-git-d88dfd873232dafd480c2d0382b4ff3add9c936d.tar.gz |
MDEV-19350 Server crashes in delete_tree_element / ... / Item_func_group_concat::repack_tree
Item_func_group_concat stores values in `tree`, which is often, but not
always the same as `&tree_base`.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 281b3af5a4d..71f07706d22 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3345,8 +3345,8 @@ bool Item_func_group_concat::repack_tree(THD *thd) delete_tree(&st.tree); return 1; } - delete_tree(&tree_base); - tree_base= st.tree; + delete_tree(tree); + *tree= st.tree; tree_len= st.len; return 0; } |