From 4ca7b226c05ae883accec64b1afe6d60daf1b323 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Tue, 30 Aug 2016 09:16:50 +0300
Subject: [PATCH] Safety fix to previous patch

---
 sql/wsrep_var.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
index 318b35158fe23..f48f08852dc14 100644
--- a/sql/wsrep_var.cc
+++ b/sql/wsrep_var.cc
@@ -356,11 +356,11 @@ bool wsrep_cluster_address_check (sys_var *self, THD* thd, set_var* var)
   char addr_buf[FN_REFLEN];
 
   if ((! var->save_result.string_value.str) ||
-      (var->save_result.string_value.length > (FN_REFLEN - 1))) // safety
+      (var->save_result.string_value.length >= sizeof(addr_buf))) // safety
     goto err;
 
   strmake(addr_buf, var->save_result.string_value.str,
-          sizeof(addr_buf)-1);
+          MY_MIN(sizeof(addr_buf)-1, var->save_result.string_value.length));
 
   if (!wsrep_cluster_address_verify(addr_buf))
     return 0;