wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

properly tear down the disk_io_thread object in set_piece_hashes() when exiting via an exception

This commit is contained in:
arvidn 2018-10-15 10:03:06 +02:00 committed by Arvid Norberg
parent 4a71cc5d89
commit 269f0c5fb8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/create_torrent.cpp
View File

@ -245,6 +245,18 @@ namespace libtorrent
, default_pred, flags); , default_pred, flags);
} }
namespace {
struct disk_aborter
{
disk_aborter(disk_io_thread& dio) : m_dio(dio) {}
~disk_aborter() { m_dio.abort(true); }
private:
disk_aborter(disk_aborter const&);
disk_aborter& operator=(disk_aborter const);
disk_io_thread& m_dio;
};
}
void set_piece_hashes(create_torrent& t, std::string const& p void set_piece_hashes(create_torrent& t, std::string const& p
, boost::function<void(int)> const& f, error_code& ec) , boost::function<void(int)> const& f, error_code& ec)
{ {
@ -284,6 +296,7 @@ namespace libtorrent
#else #else
disk_thread.set_num_threads(1); disk_thread.set_num_threads(1);
#endif #endif
disk_aborter da(disk_thread);
storage_params params; storage_params params;
params.files = &t.files(); params.files = &t.files();
@ -326,7 +339,6 @@ namespace libtorrent
#else #else
ios.run(ec); ios.run(ec);
#endif #endif
disk_thread.abort(true);
} }
create_torrent::~create_torrent() {} create_torrent::~create_torrent() {}