Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AP_Filesystem: Don't try and rename between backends #29004

Merged
merged 1 commit into from
Jan 5, 2025
+11 −2
Merged

AP_Filesystem: Don't try and rename between backends #29004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions libraries/AP_Filesystem/AP_Filesystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,17 @@ int AP_Filesystem::mkdir(const char *pathname)

int AP_Filesystem::rename(const char *oldpath, const char *newpath)
{
const Backend &backend = backend_by_path(oldpath);
return backend.fs.rename(oldpath, newpath);
const Backend &oldbackend = backend_by_path(oldpath);

// Don't need the backend again, but we also need to remove the backend pre-fix from the new path.
const Backend &newbackend = backend_by_path(newpath);

// Don't try and rename between backends.
if (&oldbackend != &newbackend) {
return -1;
}

return oldbackend.fs.rename(oldpath, newpath);
}

AP_Filesystem::DirHandle *AP_Filesystem::opendir(const char *pathname)
Expand Down
Loading