From a08121c978f17e834e852802e7516b0aba6344e6 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Thu, 15 Feb 2018 17:40:14 +0000 Subject: [PATCH] MDEV-14997 mariabackup crashes with invalid --innodb-flush-method Avoid NULL pointer dereference when shutting down after invalid parameters were parsed. --- extra/mariabackup/xtrabackup.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); }