From 2d1766594ec7ad2442abec5b102c213650ffd99199a104ce7366a96a17bf75d3 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 26 Sep 2017 12:02:29 +0000 Subject: [PATCH] Refresh u_Unset-pixel-buffer-when-x0vncserver-client-disconnect.patch. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=122 --- ...r-when-x0vncserver-client-disconnect.patch | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/u_Unset-pixel-buffer-when-x0vncserver-client-disconnect.patch b/u_Unset-pixel-buffer-when-x0vncserver-client-disconnect.patch index 0ea3cfb..f158306 100644 --- a/u_Unset-pixel-buffer-when-x0vncserver-client-disconnect.patch +++ b/u_Unset-pixel-buffer-when-x0vncserver-client-disconnect.patch @@ -11,11 +11,11 @@ Otherwise the VNCServer could try to access it and crash, for example in deferre unix/x0vncserver/x0vncserver.cxx | 6 +++++- 2 files changed, 9 insertions(+), 11 deletions(-) -diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx -index 46c4be9b..99480133 100644 ---- a/common/rfb/VNCServerST.cxx -+++ b/common/rfb/VNCServerST.cxx -@@ -313,6 +313,8 @@ void VNCServerST::setPixelBuffer(PixelBuffer* pb_, const ScreenSet& layout) +Index: tigervnc-1.8.0/common/rfb/VNCServerST.cxx +=================================================================== +--- tigervnc-1.8.0.orig/common/rfb/VNCServerST.cxx ++++ tigervnc-1.8.0/common/rfb/VNCServerST.cxx +@@ -312,6 +312,8 @@ void VNCServerST::setPixelBuffer(PixelBu screenLayout = layout; if (!pb) { @@ -24,7 +24,7 @@ index 46c4be9b..99480133 100644 if (desktopStarted) throw Exception("setPixelBuffer: null PixelBuffer when desktopStarted?"); 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_) { @@ -45,12 +45,12 @@ index 46c4be9b..99480133 100644 Rect fbRect; ScreenSet::iterator iter, iter_next; -diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx -index 6fd6bc3b..ed5b1a10 100644 ---- a/unix/x0vncserver/x0vncserver.cxx -+++ b/unix/x0vncserver/x0vncserver.cxx -@@ -270,7 +270,8 @@ public: - TXWindow::setGlobalEventHandler(this); +Index: tigervnc-1.8.0/unix/x0vncserver/x0vncserver.cxx +=================================================================== +--- tigervnc-1.8.0.orig/unix/x0vncserver/x0vncserver.cxx ++++ tigervnc-1.8.0/unix/x0vncserver/x0vncserver.cxx +@@ -176,7 +176,8 @@ public: + #endif } virtual ~XDesktop() { - stop(); @@ -59,7 +59,7 @@ index 6fd6bc3b..ed5b1a10 100644 } inline void poll() { -@@ -327,6 +328,9 @@ public: +@@ -223,6 +224,9 @@ public: XDamageDestroy(dpy, damage); #endif @@ -69,6 +69,3 @@ index 6fd6bc3b..ed5b1a10 100644 delete pb; pb = 0; } --- -2.12.3 -