Merge pull request elfmz#2541 from exkrexpexfex/master

Crash on concurrent access to temp directory
akruphi · Dec 3, 2024 · 1af0cec · 1af0cec
2 parents 2c03f3a + 2e2b60a
commit 1af0cec
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/far2l/src/findfile.cpp b/far2l/src/findfile.cpp
@@ -1173,18 +1173,16 @@ static void AnalyzeFileItem(HANDLE hDlg, PluginPanelItem *FileItem, const wchar_
 
 	FARString FileToScan;
 	if (hPlugin != INVALID_HANDLE_VALUE) {
+		PluginLocker Lock;
 		if (!CtrlObject->Plugins.UseFarCommand(hPlugin, PLUGIN_FARGETFILES)) {
 			FARString strTempDir;
 			FarMkTempEx(strTempDir);
 			apiCreateDirectory(strTempDir, nullptr);
 
 			bool GetFileResult = false;
-			{
-				PluginLocker Lock;
-				GetFileResult = CtrlObject->Plugins.GetFile(hPlugin, FileItem, strTempDir, FileToScan,
+			GetFileResult = CtrlObject->Plugins.GetFile(hPlugin, FileItem, strTempDir, FileToScan,
 										OPM_SILENT | OPM_FIND)
 						!= FALSE;
-			}
 			if (!GetFileResult) {
 				apiRemoveDirectory(strTempDir);
 				return;