Skip to content

Fix mstscax control instance and TS property-set reference leaks #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marc-André Moreau (mamoreau-devolutions) merged 1 commit into from
Sep 24, 2026
Merged

Fix mstscax control instance and TS property-set reference leaks #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions dll/MsRdpClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,22 @@ class CMsRdpClient : public IMsRdpClient10
MsRdpEx_D3D11Capture_ReleaseInstance(
(IMsRdpExInstance*)m_pMsRdpExInstance);

// Release our wrapper objects before the control's interfaces:
// they hold references to control-internal objects (TS property
// sets) whose lifetime is owned by the wrapped control.
if (m_pMsRdpExtendedSettings) {
IMsRdpExtendedSettings* pMsRdpExtendedSettings = (IMsRdpExtendedSettings*) m_pMsRdpExtendedSettings;
pMsRdpExtendedSettings->Release();
pMsRdpExtendedSettings = NULL;
}

if (m_pMsRdpExInstance) {
if (m_instanceRegistered)
MsRdpEx_InstanceManager_Remove(m_pMsRdpExInstance);
((IMsRdpExInstance*)m_pMsRdpExInstance)->Release();
m_pMsRdpExInstance = NULL;
}

m_pUnknown->Release();
if (m_pDispatch) m_pDispatch->Release();
if (m_pMsTscAx) m_pMsTscAx->Release();
Expand All @@ -203,19 +219,6 @@ class CMsRdpClient : public IMsRdpClient10
if (m_pMsRdpClient8) m_pMsRdpClient8->Release();
if (m_pMsRdpClient9) m_pMsRdpClient9->Release();
if (m_pMsRdpClient10) m_pMsRdpClient10->Release();

if (m_pMsRdpExtendedSettings) {
IMsRdpExtendedSettings* pMsRdpExtendedSettings = (IMsRdpExtendedSettings*) m_pMsRdpExtendedSettings;
pMsRdpExtendedSettings->Release();
pMsRdpExtendedSettings = NULL;
}

if (m_pMsRdpExInstance) {
if (m_instanceRegistered)
MsRdpEx_InstanceManager_Remove(m_pMsRdpExInstance);
((IMsRdpExInstance*)m_pMsRdpExInstance)->Release();
m_pMsRdpExInstance = NULL;
}
}

// IUnknown interface
Expand Down Expand Up @@ -885,9 +888,14 @@ class CClassFactory : IClassFactory
(m_clsid == CLSID_MsRdpClient10NotSafeForScripting) ||
(m_clsid == CLSID_MsRdpClient11NotSafeForScripting))
{
CMsRdpClient* pMsRdpClient = new CMsRdpClient((IUnknown*)*ppvObject);
IUnknown* pUnknown = (IUnknown*)*ppvObject;
CMsRdpClient* pMsRdpClient = new CMsRdpClient(pUnknown);
hr = pMsRdpClient->QueryInterface(riid, ppvObject);
pMsRdpClient->Release();
// Release the class factory's reference on the wrapped control:
// the wrapper holds its own reference from its constructor, and
// keeping the factory's reference would leak the control forever.
pUnknown->Release();
}
}

Expand Down
1 change: 1 addition & 0 deletions dll/RdpSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@ class CMsRdpPropertySet : public IMsRdpExtendedSettings
{
m_refCount = 1;
m_pUnknown = pUnknown;
pUnknown->AddRef(); // balances m_pUnknown->Release() in the destructor
pUnknown->QueryInterface(IID_ITSPropertySet, (LPVOID*)&m_pTSPropertySet);

if (m_pTSPropertySet)
Expand Down
Loading