diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-15 17:40:14 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-15 17:40:14 +0000 |
| commit | a08121c978f17e834e852802e7516b0aba6344e6 (patch) | |
| tree | bd831223c52260d50d153674921d21014356b242 /extra | |
| parent | 5ab46028103ca91451ea2449e238c37168e54ad0 (diff) | |
| download | mariadb-git-a08121c978f17e834e852802e7516b0aba6344e6.tar.gz | |
MDEV-14997 mariabackup crashes with invalid --innodb-flush-method
Avoid NULL pointer dereference when shutting down after invalid parameters
were parsed.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 7ac168b1778..18c7474a2e8 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3569,7 +3569,9 @@ xtrabackup_backup_func() if(innodb_init_param()) { fail: stop_backup_threads(); - innodb_shutdown(); + if (fil_system) { + innodb_shutdown(); + } return(false); } |