publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix animated cursor resize crash

Browse Source
This commit is contained in:
Lauri Kasanen
2021-06-15 15:39:48 +03:00
parent 9144045718
commit 29e0e2bd2e
6 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/rfb/CMsgHandler.h
View File

@@ -50,7 +50,7 @@ namespace rfb {
int w, int h,
const ScreenSet& layout);
virtual void setCursor(int width, int height, const Point& hotspot,
const rdr::U8* data) = 0;
const rdr::U8* data, const bool resizing = false) = 0;
virtual void setPixelFormat(const PixelFormat& pf);
virtual void setName(const char* name);
virtual void fence(rdr::U32 flags, unsigned len, const char data[]);

2
common/rfb/VNCServer.h
View File

@@ -79,7 +79,7 @@ namespace rfb {
// cursorData argument contains width*height rgba quadruplets with
// non-premultiplied alpha.
virtual void setCursor(int width, int height, const Point& hotspot,
const rdr::U8* cursorData) = 0;
const rdr::U8* cursorData, const bool resizing = false) = 0;
// setCursorPos() tells the server the current position of the cursor, and
// whether the server initiated that change (e.g. through another X11

9
common/rfb/VNCServerST.cxx
View File

@@ -579,7 +579,7 @@ void VNCServerST::add_copied(const Region& dest, const Point& delta)
}
void VNCServerST::setCursor(int width, int height, const Point& newHotspot,
const rdr::U8* data)
const rdr::U8* data, const bool resizing)
{
delete cursor;
cursor = new Cursor(width, height, newHotspot, data);
@@ -587,6 +587,13 @@ void VNCServerST::setCursor(int width, int height, const Point& newHotspot,
renderedCursorInvalid = true;
// If an app has an animated cursor on the resized edge, X internals
// will call for it to be rendered. Unlucky for us, the VNC screen
// is currently pointing to freed memory, and a cursor change
// would want to send a screen update. So, don't do that.
if (resizing)
return;
std::list<VNCSConnectionST*>::iterator ci, ci_next;
for (ci = clients.begin(); ci != clients.end(); ci = ci_next) {
ci_next = ci; ci_next++;

2
common/rfb/VNCServerST.h
View File

@@ -102,7 +102,7 @@ namespace rfb {
virtual void add_changed(const Region &region);
virtual void add_copied(const Region &dest, const Point &delta);
virtual void setCursor(int width, int height, const Point& hotspot,
const rdr::U8* data);
const rdr::U8* data, const bool resizing = false);
virtual void setCursorPos(const Point& p, bool warped);
virtual void setLEDState(unsigned state);