smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: remove ClipboardSending handler in proxy destructors (UAF)

Browse source 
fixes: #9842
This commit is contained in:
Charles Le (cle-air-m3) 2026-06-09 23:32:33 -07:00 committed by Nick Bolton
parent 750fdbeb34
commit 13f98475a2
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/lib/client/ServerProxy.cpp
View file

@ -55,6 +55,7 @@ ServerProxy::~ServerProxy()
{ {
setKeepAliveRate(-1.0); setKeepAliveRate(-1.0);
m_events->removeHandler(EventTypes::StreamInputReady, m_stream->getEventTarget()); m_events->removeHandler(EventTypes::StreamInputReady, m_stream->getEventTarget());
m_events->removeHandler(EventTypes::ClipboardSending, this);
} }
void ServerProxy::resetKeepAliveAlarm() void ServerProxy::resetKeepAliveAlarm()

5
src/lib/server/ClientProxy1_6.cpp
View file

@ -26,6 +26,11 @@ ClientProxy1_6::ClientProxy1_6(const std::string &name, deskflow::IStream *strea
}); });
} }
ClientProxy1_6::~ClientProxy1_6()
{
m_events->removeHandler(EventTypes::ClipboardSending, this);
}
void ClientProxy1_6::setClipboard(ClipboardID id, const IClipboard *clipboard) void ClientProxy1_6::setClipboard(ClipboardID id, const IClipboard *clipboard)
{ {
// ignore if this clipboard is already clean // ignore if this clipboard is already clean

2
src/lib/server/ClientProxy1_6.h
View file

@ -16,7 +16,7 @@ class ClientProxy1_6 : public ClientProxy1_5
{ {
public: public:
ClientProxy1_6(const std::string &name, deskflow::IStream *adoptedStream, Server *server, IEventQueue *events); ClientProxy1_6(const std::string &name, deskflow::IStream *adoptedStream, Server *server, IEventQueue *events);
~ClientProxy1_6() override = default; ~ClientProxy1_6() override;
void setClipboard(ClipboardID id, const IClipboard *clipboard) override; void setClipboard(ClipboardID id, const IClipboard *clipboard) override;
bool recvClipboard() override; bool recvClipboard() override;