diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2019-07-19 11:42:08 +0300 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2019-07-19 11:42:08 +0300 |
| commit | 9c29d068627313d29621adc53be4620e8257e805 (patch) | |
| tree | 72c160c133b46f9ae8855c82629e405f0173f3ee /storage/innobase | |
| parent | 6a55aeb2afa11ae04c7e467bee71875fa3bf029a (diff) | |
| download | mariadb-git-9c29d068627313d29621adc53be4620e8257e805.tar.gz | |
MDEV-20097 potential use-after-free
row_merge_read_clustered_index(): fix one more place with buf and merge_buf[i]
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index 0fd981a5e66..3783b926efa 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -2431,6 +2431,7 @@ write_buffers: BTR_SEARCH_LEAF, &pcur, &mtr); buf = row_merge_buf_empty(buf); + merge_buf[i] = buf; /* Restart the outer loop on the record. We did not insert it into any index yet. */ |