From b0a6540bdc7661911c592274ef1e4b367adcad87 Mon Sep 17 00:00:00 2001
From: cmurialdo <cmurialdo@genexus.com>
Date: Fri, 3 Feb 2023 16:07:11 -0300
Subject: [PATCH 1/3] Fix  Null Dereference and Privacy Violation issues.

---
 .../DynServiceFabric/FabricConnection.cs      | 33 ++++++++++---------
 .../GxClasses/Data/GXDataMysqlDriverCS.cs     |  1 -
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dotnet/src/dotnetframework/DynServiceFabric/FabricConnection.cs b/dotnet/src/dotnetframework/DynServiceFabric/FabricConnection.cs
index 6be7c9970..6ce703d24 100644
--- a/dotnet/src/dotnetframework/DynServiceFabric/FabricConnection.cs
+++ b/dotnet/src/dotnetframework/DynServiceFabric/FabricConnection.cs
@@ -36,30 +36,31 @@ bool SetServiceData(string connStr, GxHttpClient restClient)
 		{
 			DbConnectionStringBuilder builder = new DbConnectionStringBuilder(false);
 			builder.ConnectionString = connStr;
-			object serviceUri = "";
-			object userID = "";
-			object password = "";
+			object userID;
 			if (builder.TryGetValue("User Id", out userID))
 			{
+				object password;
 				if (builder.TryGetValue("Password", out password))
 				{
 					restClient.AddAuthentication(0, "", userID.ToString(), password.ToString());
 				}
 			}
-			object ds_data = "";
-			object uri_data = "";
+
+			object ds_data;
+			object uri_data;
+			object serviceUri;
 			if (builder.TryGetValue("Data Source", out ds_data))
 				serviceUri = ds_data;
 			else
 				if (builder.TryGetValue("uri", out uri_data))
-					serviceUri = uri_data;
-				else
-					serviceUri = null;
+				serviceUri = uri_data;
+			else
+				serviceUri = null;
 
 			if (serviceUri != null)
 			{
-				String urlstring = "";
 				String[] parts = serviceUri.ToString().Split(new String[] { "://" }, StringSplitOptions.None);
+				string urlstring;
 				if (parts.Length > 1)
 				{
 					if (parts[0].Equals("https"))
@@ -126,13 +127,13 @@ public override int ExecuteNonQuery(ServiceCursorDef cursorDef, IDataParameterCo
 						}
 						else
 						{
-							throw new GxADODataException("Error executing: " + restClient.ToString());
+							throw new GxADODataException("Error executing: " + restClient.ErrCode +":" + restClient.ErrDescription);
 						}
 					}
 				}
 				else
 				{
-					throw new GxADODataException("Error connecting : " + this.ConnectionString );
+					throw new GxADODataException("Error connecting : " + restClient.Url);
 				}
 			}
 			else
@@ -154,10 +155,10 @@ private bool  processError(short code, string msg, out int statusCode, out strin
 				try
 				{
 					dynamic dynresponse = jss.Deserialize(msg, queryresponse.GetType());
-					var resultdata = (dynresponse as Dictionary<string, object>)["error"];
-					if (resultdata != null)
+					object resultdata = (dynresponse as Dictionary<string, object>)["error"];
+					String resultmessage = resultdata as String;
+					if (resultmessage != null)
 					{
-						String resultmessage = resultdata as String;
 						if (resultmessage.Contains("101"))
 						{
 							statusCode = 101;
@@ -206,7 +207,7 @@ public override IDataReader ExecuteReader(ServiceCursorDef cursorDef, IDataParam
 			FabricDataReader reader = null;
 			DataStoreHelperFabric.Query query = cursorDef.Query as DataStoreHelperFabric.Query;
 			payLoad.Clear();
-			if (query.Filters.Length == 0)
+			if (query!=null && query.Filters.Length == 0)
 			{
 				Dictionary<String, String> tempParms = new Dictionary<string, string>();
 				foreach (KeyValuePair<String, String> kvp in query.Parms)
@@ -349,7 +350,7 @@ FabricDataReader runFabricQuery(DataStoreHelperFabric.Query query, Dictionary<st
 				}
 				else
 				{
-					throw new GxADODataException("Error executing: " + restClient.ToString());
+					throw new GxADODataException("Error executing: " + restClient.ErrCode + ":" + restClient.ErrDescription);
 				}
 			}
 			else
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs
index f06a97d60..54fb262e4 100644
--- a/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs
+++ b/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs
@@ -97,7 +97,6 @@ protected override string BuildConnectionString(string datasourceName, string us
 			string maxpoolSize = GetParameterValue(connstr, "Max Pool Size");
 			if (String.IsNullOrEmpty(maxpoolSize)) MAX_TRIES = 100; 
 			else MAX_TRIES = Convert.ToInt32(maxpoolSize);
-			GXLogging.Debug(log, "MAX_TRIES=" + MAX_TRIES);
 			return connstr;
 		}
 		public override bool AllowsDuplicateParameters

From a94088d1a005babad668d7904e6535e1b9a5681d Mon Sep 17 00:00:00 2001
From: cmurialdo <cmurialdo@genexus.com>
Date: Fri, 3 Feb 2023 16:13:17 -0300
Subject: [PATCH 2/3] Fix Null Dereference

---
 .../Azure/Handlers/QueueHandler/QueueTriggerHandler.cs          | 2 +-
 .../Handlers/ServiceBusHandler/ServiceBusTriggerHandler.cs      | 2 +-
 .../Azure/Handlers/TimerHandler/TimerTriggerHandler.cs          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dotnet/src/extensions/Azure/Handlers/QueueHandler/QueueTriggerHandler.cs b/dotnet/src/extensions/Azure/Handlers/QueueHandler/QueueTriggerHandler.cs
index 6551de9ac..01ae92cdc 100644
--- a/dotnet/src/extensions/Azure/Handlers/QueueHandler/QueueTriggerHandler.cs
+++ b/dotnet/src/extensions/Azure/Handlers/QueueHandler/QueueTriggerHandler.cs
@@ -78,7 +78,7 @@ private QueueMessage SetupMessage(FunctionContext context, string item)
 		private void ProcessMessage(FunctionContext context, ILogger log, QueueMessage queueMessage)
 		{
 			CallMappings callmap = (CallMappings)_callmappings;
-			GxAzMappings map = callmap.mappings is object ? callmap.mappings.First(m => m.FunctionName == context.FunctionDefinition.Name) : null;
+			GxAzMappings map = (callmap!=null && callmap.mappings is object) ? callmap.mappings.First(m => m.FunctionName == context.FunctionDefinition.Name) : null;
 			string gxProcedure = map is object ? map.GXEntrypoint : string.Empty;
 
 			string exMessage;
diff --git a/dotnet/src/extensions/Azure/Handlers/ServiceBusHandler/ServiceBusTriggerHandler.cs b/dotnet/src/extensions/Azure/Handlers/ServiceBusHandler/ServiceBusTriggerHandler.cs
index 3d3b4fcfa..96685ff76 100644
--- a/dotnet/src/extensions/Azure/Handlers/ServiceBusHandler/ServiceBusTriggerHandler.cs
+++ b/dotnet/src/extensions/Azure/Handlers/ServiceBusHandler/ServiceBusTriggerHandler.cs
@@ -102,7 +102,7 @@ private Message SetupMessage(FunctionContext context, string item)
 		private void ProcessMessage(FunctionContext context, ILogger log, Message message)
 		{
 			CallMappings callmap = (CallMappings)_callmappings;
-			GxAzMappings map = callmap.mappings is object ? callmap.mappings.First(m => m.FunctionName == context.FunctionDefinition.Name) : null;
+			GxAzMappings map = (callmap!=null && callmap.mappings is object) ? callmap.mappings.First(m => m.FunctionName == context.FunctionDefinition.Name) : null;
 			string gxProcedure = map is object ? map.GXEntrypoint : string.Empty;
 
 			string exMessage;
diff --git a/dotnet/src/extensions/Azure/Handlers/TimerHandler/TimerTriggerHandler.cs b/dotnet/src/extensions/Azure/Handlers/TimerHandler/TimerTriggerHandler.cs
index de65257b8..40378cedb 100644
--- a/dotnet/src/extensions/Azure/Handlers/TimerHandler/TimerTriggerHandler.cs
+++ b/dotnet/src/extensions/Azure/Handlers/TimerHandler/TimerTriggerHandler.cs
@@ -43,7 +43,7 @@ private void ProcessMessage(FunctionContext context, ILogger log, MyInfo TimerIn
 			CallMappings callmap = (CallMappings)_callmappings;
 
 			GxAzMappings map = callmap.mappings is object ? callmap.mappings.First(m => m.FunctionName == context.FunctionDefinition.Name) : null;
-			string gxProcedure = map is object ? map.GXEntrypoint : string.Empty;
+			string gxProcedure = (map != null && map is object) ? map.GXEntrypoint : string.Empty;
 			string exMessage;
 
 			if (!string.IsNullOrEmpty(gxProcedure))

From 0d3e5b0e30b2e572a8ce338905d8ec839c9a7227 Mon Sep 17 00:00:00 2001
From: cmurialdo <cmurialdo@genexus.com>
Date: Fri, 3 Feb 2023 16:36:46 -0300
Subject: [PATCH 3/3] Undo changes on FabricConnection. It will be removed.

---
 .../DynServiceFabric/FabricConnection.cs      | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/dotnet/src/dotnetframework/DynServiceFabric/FabricConnection.cs b/dotnet/src/dotnetframework/DynServiceFabric/FabricConnection.cs
index 6ce703d24..6be7c9970 100644
--- a/dotnet/src/dotnetframework/DynServiceFabric/FabricConnection.cs
+++ b/dotnet/src/dotnetframework/DynServiceFabric/FabricConnection.cs
@@ -36,31 +36,30 @@ bool SetServiceData(string connStr, GxHttpClient restClient)
 		{
 			DbConnectionStringBuilder builder = new DbConnectionStringBuilder(false);
 			builder.ConnectionString = connStr;
-			object userID;
+			object serviceUri = "";
+			object userID = "";
+			object password = "";
 			if (builder.TryGetValue("User Id", out userID))
 			{
-				object password;
 				if (builder.TryGetValue("Password", out password))
 				{
 					restClient.AddAuthentication(0, "", userID.ToString(), password.ToString());
 				}
 			}
-
-			object ds_data;
-			object uri_data;
-			object serviceUri;
+			object ds_data = "";
+			object uri_data = "";
 			if (builder.TryGetValue("Data Source", out ds_data))
 				serviceUri = ds_data;
 			else
 				if (builder.TryGetValue("uri", out uri_data))
-				serviceUri = uri_data;
-			else
-				serviceUri = null;
+					serviceUri = uri_data;
+				else
+					serviceUri = null;
 
 			if (serviceUri != null)
 			{
+				String urlstring = "";
 				String[] parts = serviceUri.ToString().Split(new String[] { "://" }, StringSplitOptions.None);
-				string urlstring;
 				if (parts.Length > 1)
 				{
 					if (parts[0].Equals("https"))
@@ -127,13 +126,13 @@ public override int ExecuteNonQuery(ServiceCursorDef cursorDef, IDataParameterCo
 						}
 						else
 						{
-							throw new GxADODataException("Error executing: " + restClient.ErrCode +":" + restClient.ErrDescription);
+							throw new GxADODataException("Error executing: " + restClient.ToString());
 						}
 					}
 				}
 				else
 				{
-					throw new GxADODataException("Error connecting : " + restClient.Url);
+					throw new GxADODataException("Error connecting : " + this.ConnectionString );
 				}
 			}
 			else
@@ -155,10 +154,10 @@ private bool  processError(short code, string msg, out int statusCode, out strin
 				try
 				{
 					dynamic dynresponse = jss.Deserialize(msg, queryresponse.GetType());
-					object resultdata = (dynresponse as Dictionary<string, object>)["error"];
-					String resultmessage = resultdata as String;
-					if (resultmessage != null)
+					var resultdata = (dynresponse as Dictionary<string, object>)["error"];
+					if (resultdata != null)
 					{
+						String resultmessage = resultdata as String;
 						if (resultmessage.Contains("101"))
 						{
 							statusCode = 101;
@@ -207,7 +206,7 @@ public override IDataReader ExecuteReader(ServiceCursorDef cursorDef, IDataParam
 			FabricDataReader reader = null;
 			DataStoreHelperFabric.Query query = cursorDef.Query as DataStoreHelperFabric.Query;
 			payLoad.Clear();
-			if (query!=null && query.Filters.Length == 0)
+			if (query.Filters.Length == 0)
 			{
 				Dictionary<String, String> tempParms = new Dictionary<string, string>();
 				foreach (KeyValuePair<String, String> kvp in query.Parms)
@@ -350,7 +349,7 @@ FabricDataReader runFabricQuery(DataStoreHelperFabric.Query query, Dictionary<st
 				}
 				else
 				{
-					throw new GxADODataException("Error executing: " + restClient.ErrCode + ":" + restClient.ErrDescription);
+					throw new GxADODataException("Error executing: " + restClient.ToString());
 				}
 			}
 			else