database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-31545 GCC 13 -Wdangling-pointer in execute_show_status()

Browse Source 
The pointer was used deep in the call path.

Resolve this by setting the pointer to NULL at the end of
the function.

Tested with gcc-13.3.1 (fc38)

The warning disable 38fe266ea9 can be reverted in 10.6+ on merge.
This commit is contained in:
Daniel Black
2023-07-18 11:59:42 +10:00
parent 4b3f930639
commit fbc157ab33
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -6522,9 +6522,11 @@ static bool execute_show_status(THD *thd, TABLE_LIST *all_tables)
memcpy(&thd->status_var, &old_status_var, memcpy(&thd->status_var, &old_status_var,
offsetof(STATUS_VAR, last_cleared_system_status_var)); offsetof(STATUS_VAR, last_cleared_system_status_var));
mysql_mutex_unlock(&LOCK_status); mysql_mutex_unlock(&LOCK_status);
thd->initial_status_var= NULL;
return res; return res;
#ifdef WITH_WSREP #ifdef WITH_WSREP
wsrep_error_label: /* see WSREP_SYNC_WAIT() macro above */ wsrep_error_label: /* see WSREP_SYNC_WAIT() macro above */
thd->initial_status_var= NULL;
return true; return true;
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
} }