hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix binlogrouter build failures with GCC 8

Browse Source 
GCC 8 appears to have improved the snprintf truncation detection which
revealed problems in the binlogrouter.
This commit is contained in:
Markus Mäkelä
2018-04-17 21:55:47 +03:00
parent 3a1c2119fb
commit ad15f4d4be
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/routing/binlogrouter/blr_file.c
View File

@ -240,7 +240,7 @@ typedef struct start_encryption_event
int
blr_file_init(ROUTER_INSTANCE *router)
{
char path[PATH_MAX + 1] = "";
char path[PATH_MAX + 1 - BINLOG_FILE_EXTRA_INFO - BINLOG_FNAMELEN - 2] = "";
char filename[PATH_MAX + 1] = "";
int file_found, n = 1;
int root_len, i;
@ -262,9 +262,7 @@ blr_file_init(ROUTER_INSTANCE *router)
return 0;
}
strcpy(path, datadir);
strcat(path, "/");
strcat(path, router->service->name);
snprintf(path, sizeof(path), "%s/%s", datadir, router->service->name);
if (access(path, R_OK) == -1)
{