1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-25183 JSON_TABLE: CREATE VIEW involving NESTED PATH ends up with invalid frm.

Browse Source 
calling members of NULL object crashes on some platforms.
This commit is contained in:
Alexey Botchkov 2021-03-25 11:18:28 +04:00
parent 22e0a317be
commit 0cea1ea7d3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sql/json_table.cc
View File

@ -1208,10 +1208,9 @@ void Table_function_json_table::get_estimates(ha_rows *out_rows,
don't have to loop through the m_next_nested. don't have to loop through the m_next_nested.
*/ */
bool Json_table_nested_path::column_in_this_or_nested( bool Json_table_nested_path::column_in_this_or_nested(
const Json_table_column *jc) const const Json_table_nested_path *p, const Json_table_column *jc)
{ {
const Json_table_nested_path *p; for (; p; p= p->m_nested)
for (p= this; p; p= p->m_nested)
{ {
if (jc->m_nest == p) if (jc->m_nest == p)
return TRUE; return TRUE;
@ -1247,8 +1246,8 @@ int Json_table_nested_path::print(THD *thd, Field ***f, String *str,
return 1; return 1;
/* loop while jc belongs to the current or nested paths. */ /* loop while jc belongs to the current or nested paths. */
while(jc && (jc->m_nest == c_path || while(jc &&
c_nested->column_in_this_or_nested(jc))) (jc->m_nest == c_path || column_in_this_or_nested(c_nested, jc)))
{ {
if (first_column) if (first_column)
first_column= FALSE; first_column= FALSE;
@ -1264,7 +1263,7 @@ int Json_table_nested_path::print(THD *thd, Field ***f, String *str,
} }
else else
{ {
DBUG_ASSERT(c_nested->column_in_this_or_nested(jc)); DBUG_ASSERT(column_in_this_or_nested(c_nested, jc));
if (str->append("NESTED PATH ") || if (str->append("NESTED PATH ") ||
print_path(str, &jc->m_nest->m_path) || print_path(str, &jc->m_nest->m_path) ||
str->append(' ') || str->append(' ') ||

3
sql/json_table.h
View File

@ -97,7 +97,8 @@ private:
/* The child NESTED PATH we're currently scanning */ /* The child NESTED PATH we're currently scanning */
Json_table_nested_path *m_cur_nested; Json_table_nested_path *m_cur_nested;
bool column_in_this_or_nested(const Json_table_column *jc) const; static bool column_in_this_or_nested(const Json_table_nested_path *p,
const Json_table_column *jc);
friend class Table_function_json_table; friend class Table_function_json_table;
}; };