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

Merge pull request #321 from arvidn/bdecode-fix 

fix assert in bdecode assert
This commit is contained in:
Arvid Norberg 2015-12-12 10:53:14 -05:00
parent b0e56f0ec8 54bf83739d
commit 3a9e397bf6
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libtorrent/bdecode.hpp
View File

@ -187,7 +187,8 @@ struct bdecode_token
TORRENT_ASSERT(type != string || header_size >= 2);
TORRENT_ASSERT(off <= max_offset);
TORRENT_ASSERT(next <= max_next_item);
TORRENT_ASSERT(header_size < 8);
// the string has 2 implied header bytes, to allow for longer prefixes
TORRENT_ASSERT(header_size < 8 || (type == string && header_size < 10));
TORRENT_ASSERT(t >= 0 && t <= end);
}

29
test/test_bdecode.cpp
View File

@ -62,10 +62,31 @@ TORRENT_TEST(string)
printf("%s\n", print_entry(e).c_str());
std::pair<const char*, int> section = e.data_section();
TEST_CHECK(std::memcmp(b, section.first, section.second) == 0);
TEST_CHECK(section.second == sizeof(b) - 1);
TEST_CHECK(e.type() == bdecode_node::string_t);
TEST_CHECK(e.string_value() == std::string("abcdefghijklmnopqrstuvwxyz"));
TEST_CHECK(e.string_length() == 26);
TEST_EQUAL(section.second, sizeof(b) - 1);
TEST_EQUAL(e.type(), bdecode_node::string_t);
TEST_EQUAL(e.string_value(), std::string("abcdefghijklmnopqrstuvwxyz"));
TEST_EQUAL(e.string_length(), 26);
}
// test string-prefix
TORRENT_TEST(string_prefix1)
{
// test edge-case of a string that's nearly too long
std::string test;
test.resize(1000000 + 8);
memcpy(&test[0], "1000000:", 8);
// test is a valid bencoded string, that's quite long
bdecode_node e;
error_code ec;
int ret = bdecode(test.c_str(), test.c_str() + test.size(), e, ec);
TEST_CHECK(ret == 0);
printf("%d bytes string\n", e.string_length());
std::pair<const char*, int> section = e.data_section();
TEST_CHECK(std::memcmp(test.c_str(), section.first, section.second) == 0);
TEST_EQUAL(section.second, int(test.size()));
TEST_EQUAL(e.type(), bdecode_node::string_t);
TEST_EQUAL(e.string_length(), 1000000);
TEST_EQUAL(e.string_ptr(), test.c_str() + 8);
}
// test list