diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-10-24 22:25:54 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-10-24 22:27:27 +0300 |
| commit | 4edd4ad69807c11a2016ac1477805739270a8ee6 (patch) | |
| tree | 9b57bc7347051c3a01c4945d9f3752ac7fc23ae1 /storage/innobase | |
| parent | 021212b525e39d332cddd0b9f1656e2fa8044905 (diff) | |
| download | mariadb-git-4edd4ad69807c11a2016ac1477805739270a8ee6.tar.gz | |
MDEV-10970: Crash while loading mysqldump backup when InnoDB encryption is enabled
Follow-up: Make sure we do not reference NULL-pointer when space is being
dropped and does not contain any nodes.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index a88cf6e65bd..7a50ccd2271 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -1001,8 +1001,13 @@ retry: does not exist, we handle the situation in the function which called this function */ - if (!space || UT_LIST_GET_FIRST(space->chain)->open) { + if (!space) { + return; + } + + fil_node_t* node = UT_LIST_GET_FIRST(space->chain); + if (!node || node->open) { return; } |