octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-15 00:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call Rename outside AutoFdEntity scope (#2528)

Browse Source 
This avoids a use-after-free in the destructor.
This commit is contained in:
Andrew Gaul 2024-09-28 15:25:02 +09:00 committed by GitHub
parent e8f1e3473c
commit 52c10cd45d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/s3fs.cpp
View File

@ -1507,11 +1507,10 @@ static int rename_object(const char* from, const char* to, bool update_ctime)
if(0 != (result = put_headers(to, meta, true, /* use_st_size= */ false))){ if(0 != (result = put_headers(to, meta, true, /* use_st_size= */ false))){
return result; return result;
} }
// rename
FdManager::get()->Rename(from, to);
} }
FdManager::get()->Rename(from, to);
// Remove file // Remove file
result = s3fs_unlink(from); result = s3fs_unlink(from);
@ -1562,9 +1561,10 @@ static int rename_object_nocopy(const char* from, const char* to, bool update_ct
S3FS_PRN_ERR("could not upload file(%s): result=%d", to, result); S3FS_PRN_ERR("could not upload file(%s): result=%d", to, result);
return result; return result;
} }
FdManager::get()->Rename(from, to);
} }
FdManager::get()->Rename(from, to);
// Remove file // Remove file
result = s3fs_unlink(from); result = s3fs_unlink(from);