Merge pull request #5263 from tamasvajk/feature/fix-file-move

tamasvajk · web-flow · commit ce69e3ae66c0 · 2021-02-26T08:27:42.000+01:00
C#: Fix potentially concurrent file moves
diff --git a/csharp/extractor/Semmle.Util/FileUtils.cs b/csharp/extractor/Semmle.Util/FileUtils.cs
@@ -33,10 +33,7 @@ public static string ConvertToNative(string path)
         /// <param name="dest">Target file.</param>
         public static void MoveOrReplace(string src, string dest)
         {
-            // Potential race condition here.
-            // .net offers the facility to either move a file, or to replace it.
-            File.Delete(dest);
-            File.Move(src, dest);
+            File.Move(src, dest, overwrite: true);
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,7 @@ public static string ConvertToNative(string path)`
`33`	`33`	`/// <param name="dest">Target file.</param>`
`34`	`34`	`public static void MoveOrReplace(string src, string dest)`
`35`	`35`	`{`
`36`		`- // Potential race condition here.`
`37`		`- // .net offers the facility to either move a file, or to replace it.`
`38`		`- File.Delete(dest);`
`39`		`- File.Move(src, dest);`
	`36`	`+ File.Move(src, dest, overwrite: true);`
`40`	`37`	`}`
`41`	`38`
`42`	`39`	`/// <summary>`