BUG#34323788 - ASAN memory leaks reported by test_mysql_command_services_component.test

  Fixed ASAN memory leaks reported by
  test_services.test_mysql_command_services_component.test
  This test case was introduced by wl#14293.

  Approved by: Bharathy Satish <bharathy.x.satish@oracle.com>

Author: vsmurthys

components/test/test_mysql_command_services.cc

@@ -295,8 +295,8 @@ static char *test_mysql_command_services_apis_udf(UDF_INIT *, UDF_ARGS *args,
         (result_set.length() < *length) ? result_set.length() : (*length - 1);
     result[*length] = '\0';
   }
-err:
   *error = 0;
+err:
   cmd_query_result_srv->free_result(mysql_res);
   cmd_factory_srv->close(mysql_h);
   return result;

sql-common/client.cc

@@ -1965,6 +1965,7 @@ void STDCALL mysql_free_result(MYSQL_RES *result) {
     if (result->field_alloc) {
       result->field_alloc->Clear();
       my_free(result->field_alloc);
+      result->field_alloc = nullptr;  // to avoid double free
     }
     my_free(result->row);
     my_free(result);

sql/server_component/mysql_command_backend.cc

@@ -275,8 +275,10 @@ bool csi_advanced_command(MYSQL *mysql, enum enum_server_command command,
   }
 
   mysql_handle.mysql = mysql;
-  if (((class mysql_command_consumer_refs *)(command_consumer_srv))
-          ->factory_srv->start(&srv_ctx_h, (MYSQL_H *)&mysql_handle)) {
+  if (mcs_extn->consumer_srv_data != nullptr)
+    srv_ctx_h = reinterpret_cast<SRV_CTX_H>(mcs_extn->consumer_srv_data);
+  else if (((class mysql_command_consumer_refs *)(command_consumer_srv))
+               ->factory_srv->start(&srv_ctx_h, (MYSQL_H *)&mysql_handle)) {
     sprintf(*err_msg, "Could not create %s service",
             "mysql_text_consumer_factory_v1");
     goto error;

sql/server_component/mysql_command_services_imp.cc

@@ -230,6 +230,11 @@ DEFINE_BOOL_METHOD(mysql_command_services_imp::close, (MYSQL_H mysql_h)) {
         srv_session_detach(mcs_ext->session_svc);
         srv_session_close(mcs_ext->session_svc);
       }
+      if (mysql->field_alloc) {
+        mysql->field_alloc->Clear();
+        my_free(mysql->field_alloc);
+        mysql->field_alloc = nullptr;
+      }
       mysql_close(mysql);
       my_free(mysql_h);
     }

sql/server_component/mysql_command_services_imp.h

@@ -62,7 +62,7 @@ struct mysql_command_service_extn {
                              if it was allocated. */
   MYSQL_DATA *data = nullptr;
   void *command_consumer_services = nullptr;
-  SRV_CTX_H *consumer_srv_data;
+  SRV_CTX_H *consumer_srv_data = nullptr;
   MYSQL_THD mcs_thd = nullptr;
   const char *mcs_protocol = nullptr;
   const char *mcs_user_name = nullptr;