summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <cvicentiu@gmail.com>2021-09-07 16:32:35 +0300
committerVicențiu Ciorbaru <cvicentiu@gmail.com>2021-09-07 16:32:35 +0300
commitb85b8348e761e38dcc2d49d171b7e28c32397374 (patch)
tree03d22c6ea95877ab0d833292cc791a5a2dd0eac9 /extra
parent391f6b4f1ebe4dccfaf0181257aa46edb6253015 (diff)
parent528abc749e8a65674dd10f59a2d99d7841709939 (diff)
downloadmariadb-git-b85b8348e761e38dcc2d49d171b7e28c32397374.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/backup_copy.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
index 9b0304a6c96..be41bffa744 100644
--- a/extra/mariabackup/backup_copy.cc
+++ b/extra/mariabackup/backup_copy.cc
@@ -195,6 +195,8 @@ datadir_iter_new(const char *path, bool skip_first_level = true)
datadir_iter_t *it;
it = static_cast<datadir_iter_t *>(malloc(sizeof(datadir_iter_t)));
+ if (!it)
+ goto error;
memset(it, 0, sizeof(datadir_iter_t));
pthread_mutex_init(&it->mutex, NULL);