summaryrefslogtreecommitdiff
path: root/sql/wsrep_sst.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-09-20 21:32:53 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-09-20 21:32:53 -0400
commit8b51bacfd63ffcffa06e2815dd5ee72a45b5de79 (patch)
tree4e22f3677715a60f15e6dc074870008592cad20c /sql/wsrep_sst.cc
parent6eca463cae8e2e61469fcefa227acd4ae7b771c8 (diff)
downloadmariadb-git-8b51bacfd63ffcffa06e2815dd5ee72a45b5de79.tar.gz
MDEV-10735: Valgrind warnings around Galera SST
While copying the received state Id (uuid:seqno) to an uninitialized buffer, it was not properly null-terminated.
Diffstat (limited to 'sql/wsrep_sst.cc')
-rw-r--r--sql/wsrep_sst.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc
index d88263d75cb..7c366435472 100644
--- a/sql/wsrep_sst.cc
+++ b/sql/wsrep_sst.cc
@@ -476,13 +476,11 @@ static void* sst_joiner_thread (void* a)
} else {
// Scan state ID first followed by wsrep_gtid_domain_id.
- char uuid[512];
unsigned long int domain_id;
- size_t len= pos - out + 1;
- if (len > sizeof(uuid)) goto err; // safety check
- memcpy(uuid, out, len); // including '\0'
- err= sst_scan_uuid_seqno (uuid, &ret_uuid, &ret_seqno);
+ // Null-terminate the state-id.
+ out[pos - out]= 0;
+ err= sst_scan_uuid_seqno (out, &ret_uuid, &ret_seqno);
if (err)
{