diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-08 12:18:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-10 07:57:01 +0300 |
| commit | f92749ed36e02342abfc82d2c354c73e188ff718 (patch) | |
| tree | 1b381faf00d3ec18131e2f69d1cdb96fdebcc0d1 /storage/xtradb/row/row0mysql.cc | |
| parent | 5b3f7c0c33e74426d5d22db1ac159ddead79cbc1 (diff) | |
| download | mariadb-git-f92749ed36e02342abfc82d2c354c73e188ff718.tar.gz | |
MDEV-18220: heap-use-after-free in fts_get_table_name_prefix()
fts_table_t::parent: Remove the redundant field. Refer to
table->name.m_name instead.
fts_update_sync_doc_id(), fts_update_next_doc_id(): Remove
the redundant parameter table_name.
fts_get_table_name_prefix(): Access the dict_table_t::name.
FIXME: Ensure that this access is always covered by
dict_sys->mutex.
Diffstat (limited to 'storage/xtradb/row/row0mysql.cc')
| -rw-r--r-- | storage/xtradb/row/row0mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc index a21e32cb91e..6ee7f702b70 100644 --- a/storage/xtradb/row/row0mysql.cc +++ b/storage/xtradb/row/row0mysql.cc @@ -3841,7 +3841,7 @@ next_rec: os_thread_sleep(10000000);); table->fts->fts_status |= TABLE_DICT_LOCKED; - fts_update_next_doc_id(trx, table, NULL, 0); + fts_update_next_doc_id(trx, table, 0); fts_cache_clear(table->fts->cache); fts_cache_init(table->fts->cache); table->fts->fts_status &= ~TABLE_DICT_LOCKED; |