commit 0b5a06b8cab3718e09529f30301108a6ede0a922
author Pierre Ossman <ossman@cendio.se> Fri Nov 13 14:09:27 2015 +0100
committer Pierre Ossman <ossman@cendio.se> Fri Nov 27 11:13:31 2015 +0100
tree e892c2278e81a20fa0d2be757d64d404939901f4
parent 7b63a7cef5824cb1d0475855e179d54f631f3e7d

Protect PlatformPixelBuffer from simultaneous access

The damage tracking region needs to be protected from multiple
threads accessing it at once. The rest should be fine though.

vncviewer/PlatformPixelBuffer.cxx

diff --git a/vncviewer/PlatformPixelBuffer.cxx b/vncviewer/PlatformPixelBuffer.cxx
index 5bd50d2..522bad3 100644
--- a/vncviewer/PlatformPixelBuffer.cxx
+++ b/vncviewer/PlatformPixelBuffer.cxx
@@ -28,15 +28,19 @@
 void PlatformPixelBuffer::commitBufferRW(const rfb::Rect& r)
 {
   FullFramePixelBuffer::commitBufferRW(r);
+  mutex.lock();
   damage.assign_union(rfb::Region(r));
+  mutex.unlock();
 }
 
 rfb::Rect PlatformPixelBuffer::getDamage(void)
 {
   rfb::Rect r;
 
+  mutex.lock();
   r = damage.get_bounding_rect();
   damage.clear();
+  mutex.unlock();
 
   return r;
 }

vncviewer/PlatformPixelBuffer.h

diff --git a/vncviewer/PlatformPixelBuffer.h b/vncviewer/PlatformPixelBuffer.h
index 21b93be..795273a 100644
--- a/vncviewer/PlatformPixelBuffer.h
+++ b/vncviewer/PlatformPixelBuffer.h
@@ -19,6 +19,8 @@
 #ifndef __PLATFORMPIXELBUFFER_H__
 #define __PLATFORMPIXELBUFFER_H__
 
+#include <os/Mutex.h>
+
 #include <rfb/PixelBuffer.h>
 #include <rfb/Region.h>
 
@@ -33,6 +35,7 @@
   rfb::Rect getDamage(void);
 
 protected:
+  os::Mutex mutex;
   rfb::Region damage;
 };