Fixed critical race vulnerability in Cancel

oznetmaster · Mar 14, 2015 · 0e58073 · 0e58073
1 parent 5a75834
commit 0e58073
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/SSharpSmartThreadPool/SSharpSmartThreadPool.csproj b/SSharpSmartThreadPool/SSharpSmartThreadPool.csproj
@@ -111,7 +111,7 @@
         <Programmer />
         <ArchiveFilename>C:\Projects\Crestron\Simpl# Pro Libraries\SSharpSmartThreadPool\SSharpSmartThreadPool\bin\Debug\SSharpSmartThreadPool.cplz</ArchiveFilename>
         <MinFirmwareVersion>1.009.0029</MinFirmwareVersion>
-        <CompiledOn>3/14/2015 4:17:08 AM</CompiledOn>
+        <CompiledOn>3/14/2015 11:03:51 AM</CompiledOn>
         <AdditionalInfo />
         <EmbedSourceArchive>False</EmbedSourceArchive>
         <CopyTo />

diff --git a/SSharpSmartThreadPool/SmartThreadPool.cs b/SSharpSmartThreadPool/SmartThreadPool.cs
@@ -1657,7 +1657,14 @@ public override void Cancel (bool abortExecution)
 
 			if (abortExecution)
 				{
-				foreach (ThreadEntry threadEntry in _workerThreads.Values)
+				ThreadEntry[] threadEntries;
+				lock (_workerThreads.SyncRoot)
+					{
+					threadEntries = new ThreadEntry[_workerThreads.RealCount];
+					_workerThreads.Values.CopyTo (threadEntries, 0);
+					}
+
+				foreach (ThreadEntry threadEntry in threadEntries)
 					{
 					WorkItem workItem = threadEntry.CurrentWorkItem;
 					if (null != workItem &&

diff --git a/SSharpSmartThreadPoolTests/SSharpSmartThreadPoolTests.csproj b/SSharpSmartThreadPoolTests/SSharpSmartThreadPoolTests.csproj
@@ -141,13 +141,10 @@
         <Programmer />
         <ArchiveFilename>C:\Projects\Crestron\Simpl# Pro Libraries\SSharpSmartThreadPool\SSharpSmartThreadPoolTests\bin\Debug\SSharpSmartThreadPoolTests.cplz</ArchiveFilename>
         <MinFirmwareVersion>1.009.0029</MinFirmwareVersion>
-        <CompiledOn>3/13/2015 10:04:01 AM</CompiledOn>
+        <CompiledOn>3/14/2015 11:00:21 AM</CompiledOn>
         <AdditionalInfo />
         <EmbedSourceArchive>False</EmbedSourceArchive>
-        <CopyTo>
-          <DebugAnyCPU />
-          <ReleaseAnyCPU />
-        </CopyTo>
+        <CopyTo />
         <OriginalReferenceSources>
           <Reference sourceFilename="../../SSharpNUnitLite3/SSharpNunitLite/bin/Release/SSharpNunitLite.dll" referenceName="SSharpNunitLite" />
           <Reference sourceFilename="../../../Simpl%23%20Libraries/SSharpCrestronExtensionsLibrary/SSharpCrestronExtensionsLibrary/bin/Release/SSharpCrestronExtensionsLibrary.dll" referenceName="SSharpCrestronExtensionsLibrary" />