Merge branch 'bb-10.2-release' into bb-10.3-releasemariadb-10.3.28

1 files changed, 7 insertions, 3 deletions

diff --git a/sql/wsrep_notify.cc b/sql/wsrep_notify.cc
index 4a8d2a392f9..ae85e4e7092 100644
--- a/sql/wsrep_notify.cc
+++ b/sql/wsrep_notify.cc
@@ -41,11 +41,13 @@ void wsrep_notify_status (wsrep_member_status_t    status,
     return;
   }
 
-  char  cmd_buf[1 << 16]; // this can be long
-  long  cmd_len = sizeof(cmd_buf) - 1;
-  char* cmd_ptr = cmd_buf;
+  const long  cmd_len = (1 << 16) - 1;
+  char* cmd_ptr = (char*) my_malloc(cmd_len + 1, MYF(MY_WME));
   long  cmd_off = 0;
 
+  if (!cmd_ptr)
+    return; // the warning is in the log
+
   cmd_off += snprintf (cmd_ptr + cmd_off, cmd_len - cmd_off, "%s",
                        wsrep_notify_cmd);
 
@@ -94,6 +96,7 @@ void wsrep_notify_status (wsrep_member_status_t    status,
   {
     WSREP_ERROR("Notification buffer too short (%ld). Aborting notification.",
                cmd_len);
+    my_free(cmd_ptr);
     return;
   }
 
@@ -107,5 +110,6 @@ void wsrep_notify_status (wsrep_member_status_t    status,
     WSREP_ERROR("Notification command failed: %d (%s): \"%s\"",
                 err, strerror(err), cmd_ptr);
   }
+  my_free(cmd_ptr);
 }