rpm/tigervnc
SHA256
1
0
Fork 0
forked from pool/tigervnc
Code Pull Requests Activity

Refresh u_Unset-pixel-buffer-when-x0vncserver-client-disconnect.patch.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=122
This commit is contained in:
Michal Srb 2017-09-26 12:02:29 +00:00 committed by Git OBS Bridge
parent 4242e73826
commit f38e36d9bd
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
u_Unset-pixel-buffer-when-x0vncserver-client-disconnect.patch
View File

@ -11,11 +11,11 @@ Otherwise the VNCServer could try to access it and crash, for example in deferre
unix/x0vncserver/x0vncserver.cxx | 6 +++++- unix/x0vncserver/x0vncserver.cxx | 6 +++++-
2 files changed, 9 insertions(+), 11 deletions(-) 2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx Index: tigervnc-1.8.0/common/rfb/VNCServerST.cxx
index 46c4be9b..99480133 100644 ===================================================================
--- a/common/rfb/VNCServerST.cxx --- tigervnc-1.8.0.orig/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx +++ tigervnc-1.8.0/common/rfb/VNCServerST.cxx
@@ -313,6 +313,8 @@ void VNCServerST::setPixelBuffer(PixelBuffer* pb_, const ScreenSet& layout) @@ -312,6 +312,8 @@ void VNCServerST::setPixelBuffer(PixelBu
screenLayout = layout; screenLayout = layout;
if (!pb) { if (!pb) {
@ -24,7 +24,7 @@ index 46c4be9b..99480133 100644
if (desktopStarted) if (desktopStarted)
throw Exception("setPixelBuffer: null PixelBuffer when desktopStarted?"); throw Exception("setPixelBuffer: null PixelBuffer when desktopStarted?");
return; return;
@@ -337,18 +339,10 @@ void VNCServerST::setPixelBuffer(PixelBuffer* pb_, const ScreenSet& layout) @@ -335,18 +337,10 @@ void VNCServerST::setPixelBuffer(PixelBu
void VNCServerST::setPixelBuffer(PixelBuffer* pb_) void VNCServerST::setPixelBuffer(PixelBuffer* pb_)
{ {
@ -45,12 +45,12 @@ index 46c4be9b..99480133 100644
Rect fbRect; Rect fbRect;
ScreenSet::iterator iter, iter_next; ScreenSet::iterator iter, iter_next;
diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx Index: tigervnc-1.8.0/unix/x0vncserver/x0vncserver.cxx
index 6fd6bc3b..ed5b1a10 100644 ===================================================================
--- a/unix/x0vncserver/x0vncserver.cxx --- tigervnc-1.8.0.orig/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx +++ tigervnc-1.8.0/unix/x0vncserver/x0vncserver.cxx
@@ -270,7 +270,8 @@ public: @@ -176,7 +176,8 @@ public:
TXWindow::setGlobalEventHandler(this); #endif
} }
virtual ~XDesktop() { virtual ~XDesktop() {
- stop(); - stop();
@ -59,7 +59,7 @@ index 6fd6bc3b..ed5b1a10 100644
} }
inline void poll() { inline void poll() {
@@ -327,6 +328,9 @@ public: @@ -223,6 +224,9 @@ public:
XDamageDestroy(dpy, damage); XDamageDestroy(dpy, damage);
#endif #endif
@ -69,6 +69,3 @@ index 6fd6bc3b..ed5b1a10 100644
delete pb; delete pb;
pb = 0; pb = 0;
} }
--
2.12.3