Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2025-01-09 20:30:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed use after free on p2pool shutdown

Browse source
This commit is contained in:
SChernykh 2021-08-27 10:13:33 +02:00
parent 715c0d4e14
commit 776b1f561c
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/console_commands.cpp
View file

@ -131,6 +131,7 @@ static int do_droppeers(p2pool *m_pool, const char * /* args */)
static int do_exit(p2pool *m_pool, const char * /* args */) static int do_exit(p2pool *m_pool, const char * /* args */)
{ {
bkg_jobs_tracker.wait();
m_pool->stop(); m_pool->stop();
return 1; return 1;

13
src/p2pool.cpp
View file

@ -95,9 +95,6 @@ p2pool::p2pool(int argc, char* argv[])
p2pool::~p2pool() p2pool::~p2pool()
{ {
uv_close(reinterpret_cast<uv_handle_t*>(&m_submitBlockAsync), nullptr);
uv_close(reinterpret_cast<uv_handle_t*>(&m_blockTemplateAsync), nullptr);
uv_close(reinterpret_cast<uv_handle_t*>(&m_stopAsync), nullptr);
uv_rwlock_destroy(&m_mainchainLock); uv_rwlock_destroy(&m_mainchainLock);
uv_mutex_destroy(&m_submitBlockDataLock); uv_mutex_destroy(&m_submitBlockDataLock);
@ -290,6 +287,15 @@ void p2pool::submit_block_async(const std::vector<uint8_t>& blob)
} }
} }
void p2pool::on_stop(uv_async_t* async)
{
p2pool* pool = reinterpret_cast<p2pool*>(async->data);
uv_close(reinterpret_cast<uv_handle_t*>(&pool->m_submitBlockAsync), nullptr);
uv_close(reinterpret_cast<uv_handle_t*>(&pool->m_blockTemplateAsync), nullptr);
uv_close(reinterpret_cast<uv_handle_t*>(&pool->m_stopAsync), nullptr);
uv_stop(uv_default_loop());
}
void p2pool::submit_block() const void p2pool::submit_block() const
{ {
SubmitBlockData submit_data; SubmitBlockData submit_data;
@ -733,7 +739,6 @@ static bool init_signals(p2pool* pool)
void p2pool::stop() void p2pool::stop()
{ {
uv_stop(uv_default_loop());
uv_async_send(&m_stopAsync); uv_async_send(&m_stopAsync);
} }

2
src/p2pool.h
View file

@ -77,7 +77,7 @@ private:
static void on_submit_block(uv_async_t* async) { reinterpret_cast<p2pool*>(async->data)->submit_block(); } static void on_submit_block(uv_async_t* async) { reinterpret_cast<p2pool*>(async->data)->submit_block(); }
static void on_update_block_template(uv_async_t* async) { reinterpret_cast<p2pool*>(async->data)->update_block_template(); } static void on_update_block_template(uv_async_t* async) { reinterpret_cast<p2pool*>(async->data)->update_block_template(); }
static void on_stop(uv_async_t*) {} static void on_stop(uv_async_t*);
void submit_block() const; void submit_block() const;