mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: return error when renaming into existing file (#5563)

This commit is contained in:
Василий Чай 2023-06-19 09:30:55 +04:00 committed by Charles Kerr
parent de5f5a2efb
commit 504b77b0b9
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libtransmission/torrent.cc
View File

@ -2448,10 +2448,36 @@ namespace
{
namespace rename_helpers
{
bool renameArgsAreValid(std::string_view oldpath, std::string_view newname)
bool renameArgsAreValid(tr_torrent const* tor, std::string_view oldpath, std::string_view newname)
{
return !std::empty(oldpath) && !std::empty(newname) && newname != "."sv && newname != ".."sv &&
!tr_strvContains(newname, TR_PATH_DELIMITER);
if (std::empty(oldpath) || std::empty(newname) || newname == "."sv || newname == ".."sv ||
tr_strvContains(newname, TR_PATH_DELIMITER))
{
return false;
}
auto const newpath = tr_strvContains(oldpath, TR_PATH_DELIMITER) ?
tr_pathbuf{ tr_sys_path_dirname(oldpath), '/', newname } :
tr_pathbuf{ newname };
if (newpath == oldpath)
{
return true;
}
auto const newpath_as_dir = tr_pathbuf{ newpath, '/' };
auto const n_files = tor->file_count();
for (tr_file_index_t i = 0; i < n_files; ++i)
{
auto const& name = tor->file_subpath(i);
if (newpath == name || tr_strvStartsWith(name, newpath_as_dir))
{
return false;
}
}
return true;
}
auto renameFindAffectedFiles(tr_torrent const* tor, std::string_view oldpath)
@ -2568,7 +2594,7 @@ void torrentRenamePath(
int error = 0;
if (!renameArgsAreValid(oldpath, newname))
if (!renameArgsAreValid(tor, oldpath, newname))
{
error = EINVAL;
}

3
tests/libtransmission/rename-test.cc
View File

@ -414,6 +414,9 @@ TEST_F(RenameTest, multifileTorrent)
EXPECT_EQ(EINVAL, torrentRenameAndWait(tor, "Felidae/FelinaeX", "Genus Felinae"));
EXPECT_STREQ("Felidae", tr_torrentName(tor));
// rename filename collision
EXPECT_EQ(EINVAL, torrentRenameAndWait(tor, "Felidae/Felinae/Felis/catus/Kyphi", "Saffron"));
EXPECT_STREQ("Felidae", tr_torrentName(tor));
/***
****
***/