jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix file_storage copy constructor (would break python bindings)

Browse Source
This commit is contained in:
Arvid Norberg
2011-06-06 07:47:29 +00:00
parent 57f24128a9
commit f6f516bed0
5 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/file_storage.cpp
View File

@@ -109,7 +109,7 @@ namespace libtorrent
, symlink_attribute(fe.symlink_attribute)
, path_index(fe.path_index)
{
set_name(fe.name, fe.name_len);
set_name(fe.filename().c_str());
}
internal_file_entry& internal_file_entry::operator=(internal_file_entry const& fe)
@@ -122,7 +122,7 @@ namespace libtorrent
hidden_attribute = fe.hidden_attribute;
executable_attribute = fe.executable_attribute;
symlink_attribute = fe.symlink_attribute;
set_name(fe.name, fe.name_len);
set_name(fe.filename().c_str());
return *this;
}
@@ -131,7 +131,7 @@ namespace libtorrent
TORRENT_ASSERT(borrow_chars >= 0);
if (borrow_chars > 1023) borrow_chars = 1023;
if (name_len == 0) free((void*)name);
if (n == 0)
if (n == 0 || *n == 0)
{
TORRENT_ASSERT(borrow_chars == 0);
name = 0;