Merge pull request #1197 from microsoft/main

fixed null bug, added null check (#1196)
microsoft · Aug 13, 2021 · 74a8c44 · 74a8c44
2 parents 9e738ca + d7d2c7e
commit 74a8c44
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/MIDebugEngine/Engine.Impl/DebuggedProcess.cs b/src/MIDebugEngine/Engine.Impl/DebuggedProcess.cs
@@ -746,7 +746,11 @@ private async Task<List<LaunchCommand>> GetInitializeCommands()
                         commands.Add(new LaunchCommand("-target-attach " + _launchOptions.ProcessId.Value.ToString(CultureInfo.InvariantCulture), ignoreFailures: false, failureHandler: failureHandler));
                     }
 
-                    commands.AddRange(_launchOptions.PostRemoteConnectCommands);
+                    if (_launchOptions.PostRemoteConnectCommands != null) 
+                    {
+                        commands.AddRange(_launchOptions.PostRemoteConnectCommands);
+                    }
+
 
                     if (this.MICommandFactory.Mode == MIMode.Lldb)
                     {
@@ -832,7 +836,11 @@ private async Task<List<LaunchCommand>> GetInitializeCommands()
                         }
 
                     }
-                    commands.AddRange(_launchOptions.PostRemoteConnectCommands);
+
+                    if (_launchOptions.PostRemoteConnectCommands != null) 
+                    {
+                        commands.AddRange(_launchOptions.PostRemoteConnectCommands);
+                    }
 
                     // Environment variables are set for the debuggee only with the modes that support that
                     foreach (EnvironmentEntry envEntry in _launchOptions.Environment)