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

fix assertion failure with debug iterators when loading empty torrent files

Browse Source
This commit is contained in:
Arvid Norberg
2010-11-02 02:24:57 +00:00
parent 24916ac908
commit 618f4dcc01
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/torrent_info.cpp
View File

@@ -500,7 +500,7 @@ namespace libtorrent
lazy_entry e; lazy_entry e;
error_code ec; error_code ec;
if (lazy_bdecode(&tmp[0], &tmp[0] + tmp.size(), e, ec) != 0) if (tmp.size() == 0 || lazy_bdecode(&tmp[0], &tmp[0] + tmp.size(), e, ec) != 0)
{ {
#ifndef BOOST_NO_EXCEPTIONS #ifndef BOOST_NO_EXCEPTIONS
throw invalid_torrent_file(errors::invalid_bencoding); throw invalid_torrent_file(errors::invalid_bencoding);
@@ -563,7 +563,7 @@ namespace libtorrent
lazy_entry e; lazy_entry e;
error_code ec; error_code ec;
if (lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec) != 0) if (buf.size() == 0 || lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec) != 0)
throw invalid_torrent_file(ec); throw invalid_torrent_file(ec);
if (!parse_torrent_file(e, ec)) if (!parse_torrent_file(e, ec))
@@ -588,7 +588,7 @@ namespace libtorrent
lazy_entry e; lazy_entry e;
error_code ec; error_code ec;
if (lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec) != 0) if (buf.size() == 0 || lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec) != 0)
throw invalid_torrent_file(ec); throw invalid_torrent_file(ec);
if (!parse_torrent_file(e, ec)) if (!parse_torrent_file(e, ec))
@@ -636,7 +636,7 @@ namespace libtorrent
if (ret < 0) return; if (ret < 0) return;
lazy_entry e; lazy_entry e;
if (lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec) != 0) if (buf.size() == 0 || lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec) != 0)
return; return;
parse_torrent_file(e, ec); parse_torrent_file(e, ec);
} }
@@ -657,7 +657,7 @@ namespace libtorrent
if (ret < 0) return; if (ret < 0) return;
lazy_entry e; lazy_entry e;
if (lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec) != 0) if (buf.size() == 0 || lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec) != 0)
return; return;
parse_torrent_file(e, ec); parse_torrent_file(e, ec);
} }