Bug#36005903 mgmapi failure to parse bindadress

Bug#36018640 Test UnresolvedHosts2 passes but ndbd aborts and dumps core

(Merge mysql-trunk => mysql-8.3.0)

Change-Id: I6c65d7b4208a026cfc39e48fe34dbc3dcd7ea002

Author: blaudden

storage/ndb/src/mgmapi/mgmapi-t.cpp

@@ -27,6 +27,7 @@
 #include <mgmapi/mgmapi.h>
 #include <mgmapi/mgmapi_debug.h>
 #include "mgmapi_internal.h"
+#include "mgmcommon/NdbMgm.hpp"
 
 TAPTEST(mgmapi) {
   // Check behaviour of error translation functions with NULL handle
@@ -128,5 +129,18 @@ TAPTEST(mgmapi) {
   // Destroy handle
   ndb_mgm_destroy_handle(&h);
 
+  // Check parsing of bind address, with and without port
+  // Neither bindaddress or port is possible to check, only return code
+  {
+    ndb_mgm::handle_ptr handle(ndb_mgm_create_handle());
+    OK(ndb_mgm_set_bindaddress(handle.get(), "localhost") == 0);
+    OK(ndb_mgm_set_bindaddress(handle.get(), "localhost:12345") == 0);
+    // Illegal values
+    OK(ndb_mgm_set_bindaddress(handle.get(), "localhost:65536") == -1);
+    OK(ndb_mgm_set_bindaddress(handle.get(), "localhost:-5") == -1);
+    OK(ndb_mgm_set_bindaddress(handle.get(), "localhost:mysql") == -1);
+    OK(ndb_mgm_set_bindaddress(handle.get(), "localhost:2147483648") == -1);
+    OK(ndb_mgm_set_bindaddress(handle.get(), "localhost:-2147483649") == -1);
+  }
   return 1;  // OK
 }

storage/ndb/src/mgmapi/mgmapi.cpp

@@ -281,18 +281,17 @@ extern "C" int ndb_mgm_set_connectstring(NdbMgmHandle handle,
 extern "C" int ndb_mgm_set_bindaddress(NdbMgmHandle handle, const char *arg) {
   DBUG_ENTER("ndb_mgm_set_bindaddress");
   free(handle->m_bindaddress);
+  handle->m_bindaddress = nullptr;
+  handle->m_bindaddress_port = 0;
 
   if (arg) {
     char hostbuf[NI_MAXHOST];
     char servbuf[NI_MAXSERV];
     if (Ndb_split_string_address_port(arg, hostbuf, sizeof(hostbuf), servbuf,
                                       sizeof(servbuf)) == 0) {
       char *endp = nullptr;
-      errno = 0;
       long val = strtol(servbuf, &endp, 10);
-
-      if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN)) ||
-          (errno != 0) || (*endp != '\0') || (val > UINT16_MAX) || (val < 0)) {
+      if (*endp != '\0' || val > UINT16_MAX || val < 0) {
         // invalid address
         SET_ERROR(handle, NDB_MGM_ILLEGAL_BIND_ADDRESS, "Illegal bind address");
         DBUG_RETURN(-1);
@@ -305,9 +304,6 @@ extern "C" int ndb_mgm_set_bindaddress(NdbMgmHandle handle, const char *arg) {
       SET_ERROR(handle, NDB_MGM_ILLEGAL_BIND_ADDRESS, "Illegal bind address");
       DBUG_RETURN(-1);
     }
-  } else {
-    handle->m_bindaddress = nullptr;
-    handle->m_bindaddress_port = 0;
   }
   if (handle->cfg.ids.size() != 0) {
     handle->cfg.bind_address_port = handle->m_bindaddress_port;
@@ -428,11 +424,11 @@ static const Properties *handle_authorization_failure(NdbMgmHandle handle,
   ndb_mgmd.
   Read and return result
 
-  @param The mgmapi handle
-  @param List describing the expected reply
-  @param Name of the command to call
-  @param Arguments for the command
-  @param Any bulk data to send after the command
+  @param handle The mgmapi handle
+  @param command_reply List describing the expected reply
+  @param cmd Name of the command to call
+  @param cmd_args Arguments for the command
+  @param cmd_bulk Any bulk data to send after the command
 
  */
 static const Properties *ndb_mgm_call(

storage/ndb/test/ndbapi/testMgmd.cpp

@@ -328,6 +328,7 @@ class Ndbd : public Mgmd {
   Ndbd(int nodeid) : Mgmd(nodeid), m_args() {
     m_args.add("--ndb-nodeid=", m_nodeid);
     m_args.add("--foreground");
+    m_args.add("--loose-core-file=0");
     m_name.assfmt("ndbd_%d", nodeid);
     NDBT_find_ndbd(m_exe);
   }