sysutils/winscp
1
0
Fork 0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00
Code Activity

Proper session cleanup after upgrade to PuTTY 0.71

Browse Source 
(fixes the most prominent cleanup memory leaks)

Source commit: bc1f16cc89bb97e08790e9cd8c6aa91c40bfd339
This commit is contained in:
Martin Prikryl
2019-05-24 13:17:37 +00:00
parent 36d8279d7f
commit bdf994a731
4 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/core/SecureShell.cpp
View File

@@ -84,10 +84,6 @@ __fastcall TSecureShell::~TSecureShell()
Active = false;
ResetConnection();
CloseHandle(FSocketEvent);
sfree(FCallbackSet->ic_pktin_free);
pktin_free_queue_callback(FCallbackSet.get());
DebugAssert(FCallbackSet->pktin_freeq_head->next == FCallbackSet->pktin_freeq_head);
sfree(FCallbackSet->pktin_freeq_head);
}
//---------------------------------------------------------------------------
void __fastcall TSecureShell::ResetConnection()
@@ -1236,11 +1232,6 @@ void __fastcall TSecureShell::SendSpecial(int Code)
FLastDataSent = Now();
}
//---------------------------------------------------------------------------
void __fastcall TSecureShell::SendEOF()
{
SendSpecial(SS_EOF);
}
//---------------------------------------------------------------------------
unsigned int __fastcall TSecureShell::TimeoutPrompt(TQueryParamsTimerEvent PoolEvent)
{
FWaiting++;
@@ -1672,6 +1663,24 @@ void __fastcall TSecureShell::FreeBackend()
{
backend_free(FBackendHandle);
FBackendHandle = NULL;
// After destroying backend, ic_pktin_free should be the only remaining callback.
if (is_idempotent_callback_pending(FCallbackSet.get(), FCallbackSet->ic_pktin_free))
{
// This releases the callback and should be noop otherwise.
run_toplevel_callbacks(FCallbackSet.get());
}
sfree(FCallbackSet->ic_pktin_free);
FCallbackSet->ic_pktin_free = NULL;
DebugAssert(FCallbackSet->cbcurr == NULL);
DebugAssert(FCallbackSet->cbhead == NULL);
DebugAssert(FCallbackSet->cbtail == NULL);
DebugAssert(FCallbackSet->pktin_freeq_head->next == FCallbackSet->pktin_freeq_head);
sfree(FCallbackSet->pktin_freeq_head);
FCallbackSet->pktin_freeq_head = NULL;
}
}
//---------------------------------------------------------------------------
@@ -1692,11 +1701,17 @@ void __fastcall TSecureShell::Close()
LogEvent(L"Closing connection.");
DebugAssert(FActive);
if (backend_exitcode(FBackendHandle) < 0)
// Without main channel SS_EOF is ignored and would get stuck waiting for exit code.
if ((backend_exitcode(FBackendHandle) < 0) && winscp_query(FBackendHandle, WINSCP_QUERY_MAIN_CHANNEL))
{
// this is particularly necessary when using local proxy command
// (e.g. plink), otherwise it hangs in sk_localproxy_close
SendEOF();
SendSpecial(SS_EOF);
// Wait for the EOF exchange to complete (among other to avoid packet queue memory leaks)
while (backend_exitcode(FBackendHandle) < 0)
{
EventSelectLoop(100, false, NULL);
}
}
FreeBackend();

1
source/core/SecureShell.h
View File

@@ -131,7 +131,6 @@ public:
void __fastcall Send(const unsigned char * Buf, int Len);
void __fastcall SendSpecial(int Code);
void __fastcall Idle(unsigned int MSec = 0);
void __fastcall SendEOF();
void __fastcall SendLine(const UnicodeString & Line);
void __fastcall SendNull();

9
source/putty/callback.c vendored
View File

@@ -150,3 +150,12 @@ bool toplevel_callback_pending(CALLBACK_SET_ONLY)
// MP does not have to be guarded
return cbcurr != NULL || cbhead != NULL;
}
// WINSCP
bool is_idempotent_callback_pending(CALLBACK_SET struct IdempotentCallback *ic)
{
return
(cbhead != NULL) &&
(cbhead->fn == run_idempotent_callback) &&
(cbhead->ctx == ic);
}

1
source/putty/putty.h vendored
View File

@@ -2195,6 +2195,7 @@ struct callback_set {
void queue_toplevel_callback(CALLBACK_SET toplevel_callback_fn_t fn, void *ctx);
bool run_toplevel_callbacks(CALLBACK_SET_ONLY);
bool toplevel_callback_pending(CALLBACK_SET_ONLY);
bool is_idempotent_callback_pending(CALLBACK_SET struct IdempotentCallback *ic); // WINSCP
struct callback_set * get_callback_set(Plug * plug);
struct callback_set * get_seat_callback_set(Seat * seat);
void delete_callbacks_for_context(CALLBACK_SET void *ctx);