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

improved error handling of out of memory conditions

This commit is contained in:
Arvid Norberg 2009-02-22 20:52:55 +00:00
parent 658b7309d3
commit 80a51ad89d
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bt_peer_connection.cpp
View File

@ -620,7 +620,12 @@ namespace libtorrent
const sha1_hash remote_key = h.final(); const sha1_hash remote_key = h.final();
TORRENT_ASSERT(!m_RC4_handler.get()); TORRENT_ASSERT(!m_RC4_handler.get());
m_RC4_handler.reset(new RC4_handler (local_key, remote_key)); m_RC4_handler.reset(new (std::nothrow) RC4_handler(local_key, remote_key));
if (!m_RC4_handler)
{
disconnect("no memory");
return;
}
#ifdef TORRENT_VERBOSE_LOGGING #ifdef TORRENT_VERBOSE_LOGGING
(*m_logger) << " computed RC4 keys\n"; (*m_logger) << " computed RC4 keys\n";
@ -1819,7 +1824,6 @@ namespace libtorrent
// RECEIVE DATA // RECEIVE DATA
// -------------------------- // --------------------------
// throws exception when the client should be disconnected
void bt_peer_connection::on_receive(error_code const& error void bt_peer_connection::on_receive(error_code const& error
, std::size_t bytes_transferred) , std::size_t bytes_transferred)
{ {
@ -1938,7 +1942,12 @@ namespace libtorrent
h.update("req1", 4); h.update("req1", 4);
h.update(m_dh_key_exchange->get_secret(), dh_key_len); h.update(m_dh_key_exchange->get_secret(), dh_key_len);
m_sync_hash.reset(new sha1_hash(h.final())); m_sync_hash.reset(new (std::nothrow) sha1_hash(h.final()));
if (!m_sync_hash)
{
disconnect("no memory");
return;
}
} }
int syncoffset = get_syncoffset((char*)m_sync_hash->begin(), 20 int syncoffset = get_syncoffset((char*)m_sync_hash->begin(), 20
@ -2071,7 +2080,12 @@ namespace libtorrent
{ {
TORRENT_ASSERT(m_sync_bytes_read == 0); TORRENT_ASSERT(m_sync_bytes_read == 0);
m_sync_vc.reset (new char[8]); m_sync_vc.reset(new (std::nothrow) char[8]);
if (!m_sync_vc)
{
disconnect("no memory");
return;
}
std::fill(m_sync_vc.get(), m_sync_vc.get() + 8, 0); std::fill(m_sync_vc.get(), m_sync_vc.get() + 8, 0);
m_RC4_handler->decrypt(m_sync_vc.get(), 8); m_RC4_handler->decrypt(m_sync_vc.get(), 8);
} }