From 72aeea494e927f4f604be7008f81f4ddc426f354 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Wed, 5 Aug 2026 10:09:53 -0400
Subject: [PATCH] don't invoke completion handler within async function

---
 libi2pd/Streaming.cpp        |  7 ++++++-
 libi2pd_client/BoostStream.h | 27 +++++++++++++++++++++------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/libi2pd/Streaming.cpp b/libi2pd/Streaming.cpp
index 25c5fbe2..9370edcc 100644
--- a/libi2pd/Streaming.cpp
+++ b/libi2pd/Streaming.cpp
@@ -960,7 +960,12 @@ namespace stream
 		if (len > 0 && buf)
 			buffer = std::make_shared<i2p::stream::SendBuffer>(buf, len, std::move (handler));
 		else if (handler)
-			handler(boost::system::error_code (), 0);
+		{
+			boost::asio::post (GetService (), [handler = std::move(handler)]() mutable
+			{
+				handler(boost::system::error_code (), 0);
+			});
+		}
 		Send (std::move (buffer));
 	}
 
diff --git a/libi2pd_client/BoostStream.h b/libi2pd_client/BoostStream.h
index e21e058e..c63f06f0 100644
--- a/libi2pd_client/BoostStream.h
+++ b/libi2pd_client/BoostStream.h
@@ -43,15 +43,24 @@ namespace client
 					if (received < it->size ()) break;
 				}
 				if (received > 0) // we have some data
-					handler (boost::system::error_code (), received);
+					boost::asio::post (get_executor (), [received, handler = std::move (handler)]() mutable
+						{
+							handler (boost::system::error_code (), received);
+						});
 				else if (m_Stream->GetStatus () == i2p::stream::eStreamStatusClosed ||
 					m_Stream->GetStatus () == i2p::stream::eStreamStatusTerminated)
-					//  read stream after close, return eof with outstanding data
-					handler (boost::asio::error::make_error_code (boost::asio::error::eof), 0);
+					//  return eof
+					boost::asio::post (get_executor (), [handler = std::move (handler)]() mutable
+						{
+							handler (boost::asio::error::make_error_code (boost::asio::error::eof), 0);
+						});
 				else if (bufs.size () > 0) // wait for incoming data
 					m_Stream->AsyncReceive (*boost::asio::buffer_sequence_begin (bufs), std::move (handler), m_ReceiveTimeout);
 				else
-					handler (boost::system::error_code (), 0);
+					boost::asio::post (get_executor (), [handler = std::move (handler)]() mutable
+					{
+						handler (boost::system::error_code (), 0);
+					});
 			}
 
 			// AsyncWriteStream
@@ -78,11 +87,17 @@ namespace client
 					m_Stream->Send (std::move (sendBuffer));
 #ifndef __cpp_lib_move_only_function // no std::move_only_function
 					// invoke handler right after send
-					handler (boost::system::error_code (), sent);
+					boost::asio::post (get_executor (), [sent, handler = std::move (handler)]() mutable
+					{
+						handler (boost::system::error_code (), sent);
+					});
 #endif
 				}
 				else
-					handler (boost::system::error_code (), 0);
+					boost::asio::post (get_executor (), [handler = std::move (handler)]() mutable
+					{
+						handler (boost::system::error_code (), 0);
+					});
 			}
 
 		private: