From 6ab162d266c2b1fb1f7d22650c24ea35d4519983 Mon Sep 17 00:00:00 2001 From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:19:02 +0100 Subject: [PATCH] #4304 --- CHANGELOG.md | 2 ++ Sandboxie/core/dll/file_del.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05de5a9a..684c9414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +10,14 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added - added the ability to hide certificates in editbox in Global Setting (idea by Yeyixiao) - added Opening a program in several sandboxes at once [#4231](https://github.com/sandboxie-plus/Sandboxie/issues/4231) +- added "Description" field inside the sandbox settings [#4243](https://github.com/sandboxie-plus/Sandboxie/issues/4243) ### Fixed - fixed Sign the .tmp file that gets dropped when installing or updating Sandboxie Plus [#2643](https://github.com/sandboxie-plus/Sandboxie/issues/2643) - fixed issue with DLL unloading - fixed Files Resource Access - Browse for Folder - allows access to excluded folders [#4007](https://github.com/sandboxie-plus/Sandboxie/issues/4007) - fixed "ForceDisableAdminOnly" is weird [#4233](https://github.com/sandboxie-plus/Sandboxie/issues/4233) +- fixed deadlock on no op condition when renaming file or folder [#4304](https://github.com/sandboxie-plus/Sandboxie/issues/4304) ### Changed - validated compatibility with Windows build 27744 and updated DynData diff --git a/Sandboxie/core/dll/file_del.c b/Sandboxie/core/dll/file_del.c index dba311b9..dd8e352c 100644 --- a/Sandboxie/core/dll/file_del.c +++ b/Sandboxie/core/dll/file_del.c @@ -1090,6 +1090,11 @@ _FX BOOLEAN File_HasDeleted_v2(const WCHAR* TruePath) _FX VOID File_SetRelocation_internal(LIST* Root, const WCHAR *OldTruePath, const WCHAR *NewTruePath) { + // 0. check for no operation - in this case 5. would loop forever + + if (_wcsicmp(OldTruePath, NewTruePath) == 0) + return; + // 1. separate branch from OldTruePath LIST* Parent = NULL;