MDEV-15988 Crash in ./mtr mariabackup.undo_space_id

xb_assign_undo_space_start(): Correctly pass the length of the buffer, so that the file name will not be truncated.
MariaDB · Apr 24, 2018 · 5b79303 · 5b79303
1 parent 82d4f08
commit 5b79303
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
@@ -3107,8 +3107,8 @@ static dberr_t xb_assign_undo_space_start()
 		name[dirnamelen++] = SRV_PATH_SEPARATOR;
 	}
 
-	ut_snprintf(name + dirnamelen, strlen(name) + strlen("ibdata1"),
-		 "%s", "ibdata1");
+	ut_snprintf(name + dirnamelen, (sizeof name) - dirnamelen,
+		    "%s", "ibdata1");
 
 	file = os_file_create(innodb_file_data_key, name, OS_FILE_OPEN,
 			      OS_FILE_NORMAL, OS_DATA_FILE, &ret, 0);