diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-21 10:14:23 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-21 10:14:23 +0200 |
| commit | 5a780f2ec80ae48af44176157ab76ec104f209c0 (patch) | |
| tree | a520e4a884a8cc505ff253f4c9c0033ffe2f247c /extra | |
| parent | f41166133ba942b46bbab450a90511cee95f2496 (diff) | |
| parent | 1caec9c8982a73f3db78fabc570934b837658109 (diff) | |
| download | mariadb-git-5a780f2ec80ae48af44176157ab76ec104f209c0.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/backup_copy.cc | 3 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 21 |
2 files changed, 14 insertions, 10 deletions
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index d4581e6f952..39171f29a2a 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -2349,7 +2349,8 @@ static void rocksdb_copy_back() { return; char rocksdb_home_dir[FN_REFLEN]; if (xb_rocksdb_datadir && is_abs_path(xb_rocksdb_datadir)) { - strncpy(rocksdb_home_dir, xb_rocksdb_datadir, sizeof(rocksdb_home_dir)); + strncpy(rocksdb_home_dir, xb_rocksdb_datadir, sizeof rocksdb_home_dir - 1); + rocksdb_home_dir[sizeof rocksdb_home_dir - 1] = '\0'; } else { snprintf(rocksdb_home_dir, sizeof(rocksdb_home_dir), "%s/%s", mysql_data_home, xb_rocksdb_datadir?trim_dotslash(xb_rocksdb_datadir): ROCKSDB_BACKUP_DIR); diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 8c2411edec0..7aa32083ab0 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2547,8 +2547,9 @@ xtrabackup_copy_datafile(fil_node_t* node, uint thread_n, const char *dest_name= goto error; } - strncpy(dst_name, (dest_name)?dest_name : cursor.rel_path, sizeof(dst_name)); - + strncpy(dst_name, dest_name ? dest_name : cursor.rel_path, + sizeof dst_name - 1); + dst_name[sizeof dst_name - 1] = '\0'; /* Setup the page write filter */ if (xtrabackup_incremental) { @@ -2867,7 +2868,8 @@ static void dbug_mariabackup_event(const char *event,const char *key) if (slash) *slash = '_'; } else { - strncpy(envvar, event, sizeof(envvar)); + strncpy(envvar, event, sizeof envvar - 1); + envvar[sizeof envvar - 1] = '\0'; } char *sql = getenv(envvar); if (sql) { @@ -3278,7 +3280,7 @@ static dberr_t xb_assign_undo_space_start() byte* page; bool ret; dberr_t error = DB_SUCCESS; - ulint space, page_no __attribute__((unused)); + ulint space; int n_retries = 5; if (srv_undo_tablespaces == 0) { @@ -3320,10 +3322,10 @@ retry: /* 0th slot always points to system tablespace. 1st slot should point to first undotablespace which is minimum. */ - page_no = mach_read_ulint(TRX_SYS + TRX_SYS_RSEGS - + TRX_SYS_RSEG_SLOT_SIZE - + TRX_SYS_RSEG_PAGE_NO + page, MLOG_4BYTES); - ut_ad(page_no != FIL_NULL); + ut_ad(mach_read_from_4(TRX_SYS + TRX_SYS_RSEGS + + TRX_SYS_RSEG_SLOT_SIZE + + TRX_SYS_RSEG_PAGE_NO + page) + != FIL_NULL); space = mach_read_ulint(TRX_SYS + TRX_SYS_RSEGS + TRX_SYS_RSEG_SLOT_SIZE @@ -4484,7 +4486,8 @@ void backup_fix_ddl(void) const char *extension = is_remote ? ".isl" : ".ibd"; name.append(extension); char buf[FN_REFLEN]; - strncpy(buf, name.c_str(), sizeof(buf)); + strncpy(buf, name.c_str(), sizeof buf - 1); + buf[sizeof buf - 1] = '\0'; const char *dbname = buf; char *p = strchr(buf, '/'); if (p == 0) { |