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

Fix build failure on Ubuntu 17.10

Browse Source 
The sprintf calls failed due to a warning about possible buffer
overflow. Curiously enough, the same warnings do appear on Fedora 26 but
only when the calls are changed to snprintf.
This commit is contained in:
Markus Mäkelä
2018-01-17 12:27:50 +02:00
parent c02da103d7
commit 47184ea46d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/binlogrouter/blr_slave.c
View File

@ -1051,8 +1051,8 @@ static int
blr_slave_send_master_status(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave) blr_slave_send_master_status(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave)
{ {
GWBUF *pkt; GWBUF *pkt;
char file[40]; char file[BINLOG_FNAMELEN + 1];
char position[40]; char position[BINLOG_FNAMELEN + 1];
uint8_t *ptr; uint8_t *ptr;
int len, file_len; int len, file_len;
@ -1069,10 +1069,10 @@ blr_slave_send_master_status(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave)
BLR_TYPE_STRING, 40, 6); BLR_TYPE_STRING, 40, 6);
blr_slave_send_eof(router, slave, 7); blr_slave_send_eof(router, slave, 7);
sprintf(file, "%s", router->binlog_name); snprintf(file, sizeof(file), "%s", router->binlog_name);
file_len = strlen(file); file_len = strlen(file);
sprintf(position, "%lu", router->binlog_position); snprintf(position, sizeof(position), "%lu", router->binlog_position);
len = MYSQL_HEADER_LEN + 1 + file_len + strlen(position) + 1 + 3; len = MYSQL_HEADER_LEN + 1 + file_len + strlen(position) + 1 + 3;
if ((pkt = gwbuf_alloc(len)) == NULL) if ((pkt = gwbuf_alloc(len)) == NULL)