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

fix for missing crc check in blr_slave_fake_rotate()

Browse Source 
fix for missing crc check in blr_slave_fake_rotate()
This commit is contained in:
MassimilianoPinto
2015-06-22 18:24:39 +02:00
parent 8c900e73de
commit 15e6d6f9fc
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/routing/binlog/blr_slave.c
View File

@ -1693,6 +1693,9 @@ uint32_t chksum;
binlognamelen = strlen(slave->binlogfile); binlognamelen = strlen(slave->binlogfile);
len = 19 + 8 + 4 + binlognamelen; len = 19 + 8 + 4 + binlognamelen;
/* no slave crc, remove 4 bytes */
if (slave->nocrc)
len -= 4;
// Build a fake rotate event // Build a fake rotate event
resp = gwbuf_alloc(len + 5); resp = gwbuf_alloc(len + 5);
@ -1711,6 +1714,7 @@ uint32_t chksum;
memcpy(ptr, slave->binlogfile, binlognamelen); memcpy(ptr, slave->binlogfile, binlognamelen);
ptr += binlognamelen; ptr += binlognamelen;
if (!slave->nocrc) {
/* /*
* Now add the CRC to the fake binlog rotate event. * Now add the CRC to the fake binlog rotate event.
* *
@ -1722,6 +1726,7 @@ uint32_t chksum;
chksum = crc32(0L, NULL, 0); chksum = crc32(0L, NULL, 0);
chksum = crc32(chksum, GWBUF_DATA(resp) + 5, hdr.event_size - 4); chksum = crc32(chksum, GWBUF_DATA(resp) + 5, hdr.event_size - 4);
encode_value(ptr, chksum, 32); encode_value(ptr, chksum, 32);
}
slave->dcb->func.write(slave->dcb, resp); slave->dcb->func.write(slave->dcb, resp);
return 1; return 1;