[Pkg-tigervnc-devel] [Git][debian-remote-team/tigervnc][master] Fixed bug in PlatformPixelBuffer::setupShm to use correct width and height...

[Joachim Falk]

Joachim Falk pushed to branch master at Debian Remote Packaging Team / tigervnc


Commits:
0e182c9f by Joachim Falk at 2019-12-27T20:06:22Z
Fixed bug in PlatformPixelBuffer::setupShm to use correct width and height methods (xtigervncviewer).

- - - - -


2 changed files:

- debian/changelog
- + debian/patches/0177-tigervnc-1.10.1-fix-setupShm-wrong-width-heigh-method.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,11 @@
-tigervnc (1.10.1+dfsg-1~RC3) UNRELEASED; urgency=high
+tigervnc (1.10.1+dfsg-1~RC4) UNRELEASED; urgency=high
 
   [ Joachim Falk ]
   * Fresh upstream TigerVNC 1.10.1 fixes CVE-2019-15691, CVE-2019-15692,
     CVE-2019-15693, CVE-2019-15694, and CVE-2019-15695 (Closes: #947428)
+  * Fixed bug in PlatformPixelBuffer::setupShm to use correct width and height methods.
 
- -- Joachim Falk <joachim.falk at gmx.de>  Fri, 27 Dec 2019 13:19:04 +0100
+ -- Joachim Falk <joachim.falk at gmx.de>  Fri, 27 Dec 2019 20:46:35 +0100
 
 tigervnc (1.9.0+dfsg-4) unstable; urgency=medium
 


=====================================
debian/patches/0177-tigervnc-1.10.1-fix-setupShm-wrong-width-heigh-method.patch
=====================================
@@ -0,0 +1,27 @@
+Description: Use correct width and height methods in PlatformPixelBuffer::setupShm
+Author: Joachim Falk <joachim.falk at gmx.de>
+Abstract:
+ PlatformPixelBuffer::setupShm uses the width() and height() methods to
+ determine the correct geometry for a XImage. However, the width() and height()
+ methods are defined in both the Surface as well as the FullFramePixelBuffer
+ base classes of PlatformPixelBuffer. Before v1.10.1 these methods accessed
+ fields that where both initialized to the requested image dimensions.
+ However, starting from v1.10.1 the width() and height() methods of
+ FullFramePixelBuffer return zero when setupShm is called. It will later be
+ initialized to the correct dimensions by a setBuffer method call in the
+ constructor of PlatformPixelBuffer.
+ This patch switches to Surface::{width,height} which return the correct dimensions.
+
+Index: pkg-tigervnc/vncviewer/PlatformPixelBuffer.cxx
+===================================================================
+--- pkg-tigervnc.orig/vncviewer/PlatformPixelBuffer.cxx
++++ pkg-tigervnc/vncviewer/PlatformPixelBuffer.cxx
+@@ -153,7 +153,7 @@ bool PlatformPixelBuffer::setupShm()
+   shminfo = new XShmSegmentInfo;
+ 
+   xim = XShmCreateImage(fl_display, CopyFromParent, 32,
+-                        ZPixmap, 0, shminfo, width(), height());
++                        ZPixmap, 0, shminfo, this->Surface::width(), this->Surface::height());
+   if (!xim)
+     goto free_shminfo;
+ 



View it on GitLab: https://salsa.debian.org/debian-remote-team/tigervnc/commit/0e182c9fda6b55f56e3ab1894d62053db4f505c8

-- 
View it on GitLab: https://salsa.debian.org/debian-remote-team/tigervnc/commit/0e182c9fda6b55f56e3ab1894d62053db4f505c8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-tigervnc-devel/attachments/20191227/5c70df9c/attachment-0001.html>