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

back-port fix adding empty file as torrent

This commit is contained in:
arvidn 2016-05-14 13:13:20 -04:00
parent 53bd03558c
commit c292696dcb
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/session_impl.cpp
View File

@ -4929,6 +4929,12 @@ retry:
params.ti = t; params.ti = t;
} }
if (params.ti && !params.ti->is_valid())
{
ec = errors::no_metadata;
return ptr_t();
}
if (params.ti && params.ti->is_valid() && params.ti->num_files() == 0) if (params.ti && params.ti->is_valid() && params.ti->num_files() == 0)
{ {
ec = errors::no_files_in_torrent; ec = errors::no_files_in_torrent;

20
test/test_session.cpp
View File

@ -40,6 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/performance_counters.hpp" #include "libtorrent/performance_counters.hpp"
#include "libtorrent/bdecode.hpp" #include "libtorrent/bdecode.hpp"
#include "libtorrent/bencode.hpp" #include "libtorrent/bencode.hpp"
#include "libtorrent/torrent_info.hpp"
using namespace libtorrent; using namespace libtorrent;
namespace lt = libtorrent; namespace lt = libtorrent;
@ -59,7 +60,6 @@ TORRENT_TEST(session)
// verify that we get the appropriate performance warning because // verify that we get the appropriate performance warning because
// we're allowing a larger queue than we have cache. // we're allowing a larger queue than we have cache.
alert const* a; alert const* a;
for (;;) for (;;)
{ {
@ -93,6 +93,23 @@ TORRENT_TEST(session)
// the session object // the session object
} }
TORRENT_TEST(load_empty_file)
{
settings_pack p;
p.set_int(settings_pack::alert_mask, ~0);
lt::session ses(p);
add_torrent_params atp;
error_code ignore_errors;
atp.ti = boost::make_shared<torrent_info>("", 0, ignore_errors);
atp.save_path = ".";
error_code ec;
torrent_handle h = ses.add_torrent(atp, ec);
TEST_CHECK(!h.is_valid());
TEST_CHECK(ec == error_code(errors::no_metadata))
}
TORRENT_TEST(session_stats) TORRENT_TEST(session_stats)
{ {
std::vector<stats_metric> stats = session_stats_metrics(); std::vector<stats_metric> stats = session_stats_metrics();
@ -107,6 +124,7 @@ TORRENT_TEST(session_stats)
TEST_EQUAL(stats[i].value_index, i); TEST_EQUAL(stats[i].value_index, i);
} }
} }
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
template <typename Set, typename Save, typename Default, typename Load> template <typename Set, typename Save, typename Default, typename Load>

20
test/test_torrent_info.cpp
View File

@ -854,6 +854,26 @@ TORRENT_TEST(resolve_duplicates)
test_resolve_duplicates(i); test_resolve_duplicates(i);
} }
TORRENT_TEST(empty_file)
{
error_code ec;
boost::shared_ptr<torrent_info> ti = boost::make_shared<torrent_info>("", 0, ec);
TEST_CHECK(ec);
}
TORRENT_TEST(empty_file2)
{
try
{
boost::shared_ptr<torrent_info> ti = boost::make_shared<torrent_info>("", 0);
TEST_ERROR("expected exception thrown");
}
catch (libtorrent_exception& e)
{
printf("Expected error: %s\n", e.error().message().c_str());
}
}
TORRENT_TEST(copy) TORRENT_TEST(copy)
{ {
using namespace libtorrent; using namespace libtorrent;