mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-10 14:13:23 +00:00
Code Issues Releases Wiki Activity

Fix/benc zero length dict key (#1964)

Browse source 
* fix: benc decoding bug that failed to parse hybrid torrents
This commit is contained in:
Charles Kerr 2021-10-15 13:13:33 -05:00 • committed by GitHub
parent 23d85458f8
commit fb39c4663c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libtransmission/variant-benc.cc
View file

@ -12,6 +12,7 @@
#include <stdlib.h> /* strtoul() */
#include <string.h> /* strlen(), memchr() */
#include <string_view>
#include <optional>
#include <event2/buffer.h>
@ -128,7 +129,7 @@ int tr_bencParseStr(
return EILSEQ;
}
static tr_variant* get_node(std::deque<tr_variant*>& stack, tr_quark* key, tr_variant* top, int* err)
static tr_variant* get_node(std::deque<tr_variant*>& stack, std::optional<tr_quark>& dict_key, tr_variant* top, int* err)
{
tr_variant* node = nullptr;
@ -144,10 +145,10 @@ static tr_variant* get_node(std::deque<tr_variant*>& stack, tr_quark* key, tr_va
{
node = tr_variantListAdd(parent);
}
else if (*key != 0 && tr_variantIsDict(parent))
else if (dict_key && tr_variantIsDict(parent))
{
node = tr_variantDictAdd(parent, *key);
*key = 0;
node = tr_variantDictAdd(parent, *dict_key);
dict_key.reset();
}
else
{
@ -169,7 +170,7 @@ int tr_variantParseBenc(void const* buf_in, void const* bufend_in, tr_variant* t
auto const* buf = static_cast<uint8_t const*>(buf_in);
auto const* const bufend = static_cast<uint8_t const*>(bufend_in);
auto stack = std::deque<tr_variant*>{};
tr_quark key = 0;
auto key = std::optional<tr_quark>{};
if ((buf_in == nullptr) || (bufend_in == nullptr) || (top == nullptr))
{
@ -201,7 +202,7 @@ int tr_variantParseBenc(void const* buf_in, void const* bufend_in, tr_variant* t
buf = end;
tr_variant* const v = get_node(stack, &key, top, &err);
tr_variant* const v = get_node(stack, key, top, &err);
if (v != nullptr)
{
tr_variantInitInt(v, val);
@ -211,7 +212,7 @@ int tr_variantParseBenc(void const* buf_in, void const* bufend_in, tr_variant* t
{
++buf;
tr_variant* const v = get_node(stack, &key, top, &err);
tr_variant* const v = get_node(stack, key, top, &err);
if (v != nullptr)
{
tr_variantInitList(v, 0);
@ -222,7 +223,7 @@ int tr_variantParseBenc(void const* buf_in, void const* bufend_in, tr_variant* t
{
++buf;
tr_variant* const v = get_node(stack, &key, top, &err);
tr_variant* const v = get_node(stack, key, top, &err);
if (v != nullptr)
{
tr_variantInitDict(v, 0);
@ -233,7 +234,7 @@ int tr_variantParseBenc(void const* buf_in, void const* bufend_in, tr_variant* t
{
++buf;
if (std::empty(stack) || key != 0)
if (std::empty(stack) || key)
{
err = EILSEQ;
break;
@ -257,13 +258,14 @@ int tr_variantParseBenc(void const* buf_in, void const* bufend_in, tr_variant* t
buf = end;
if (key == 0 && !std::empty(stack) && tr_variantIsDict(stack.back()))
if (!key && !std::empty(stack) && tr_variantIsDict(stack.back()))
{
key = tr_quark_new(std::string_view{ reinterpret_cast<char const*>(str), str_len });
auto const sv = std::string_view{ reinterpret_cast<char const*>(str), str_len };
key = tr_quark_new(sv);
}
else
{
tr_variant* const v = get_node(stack, &key, top, &err);
tr_variant* const v = get_node(stack, key, top, &err);
if (v != nullptr)
{
tr_variantInitStr(v, str, str_len);

1
tests/libtransmission/CMakeLists.txt
View file

@ -28,6 +28,7 @@ add_executable(libtransmission-test
target_compile_definitions(libtransmission-test
PRIVATE
-DLIBTRANSMISSION_TEST_ASSETS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/assets"
__TRANSMISSION__)
target_include_directories(libtransmission-test

BIN
tests/libtransmission/assets/Android-x86 8.1 r6 iso.torrent Normal file
View file

Binary file not shown.

13
tests/libtransmission/metainfo-test.cc
View file

@ -161,3 +161,16 @@ TEST(Metainfo, sanitize)
tr_free(result);
}
}
TEST(Metainfo, AndroidTorrent)
{
auto* ctor = tr_ctorNew(nullptr);
auto filename = std::string{ LIBTRANSMISSION_TEST_ASSETS_DIR };
filename += '/'; // FIXME
filename += "Android-x86 8.1 r6 iso.torrent";
auto const err = tr_ctorSetMetainfoFromFile(ctor, filename.c_str());
EXPECT_EQ(0, err);
tr_ctorFree(ctor);
}