Skip to content
Snippets Groups Projects
Commit 4dae5f59 authored by Samuel Jones's avatar Samuel Jones
Browse files

Re #23739 Add further sanity check and improvements

parent 3094b738
No related branches found
No related tags found
No related merge requests found
...@@ -152,8 +152,8 @@ std::vector<int> orderProcessIDs(std::vector<Poco::Path> paths) { ...@@ -152,8 +152,8 @@ std::vector<int> orderProcessIDs(std::vector<Poco::Path> paths) {
// The folder or file here is not a number (So shouldn't exist) so delete // The folder or file here is not a number (So shouldn't exist) so delete
// it recursively. However perform a sanity check as recursively removing // it recursively. However perform a sanity check as recursively removing
// files is dangerous // files is dangerous
Poco::Path sanityCheckPath(getRecoveryFolderCheck()); const auto sanityCheckPath(getRecoveryFolderCheck());
if (sanityCheckPath.toString() == if (sanityCheckPath ==
Poco::Path(c.toString()).popDirectory().toString()) { Poco::Path(c.toString()).popDirectory().toString()) {
Poco::File(c).remove(true); Poco::File(c).remove(true);
} }
...@@ -807,7 +807,10 @@ void ProjectRecovery::repairCheckpointDirectory() { ...@@ -807,7 +807,10 @@ void ProjectRecovery::repairCheckpointDirectory() {
for (auto c : vectorToDelete) { for (auto c : vectorToDelete) {
// Remove c recursively // Remove c recursively
Poco::File(c).remove(true); const auto sanityCheckPath(getRecoveryFolderCheck());
if (sanityCheckPath == Poco::Path(c).popDirectory().toString()) {
Poco::File(c).remove(true);
}
} }
if (vectorToDelete.size() > 0) { if (vectorToDelete.size() > 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment