Bug#765490: xserver-xorg-video-vmware: diff for NMU version 1:13.0.2-3.1

[Bernd Zeimetz <bzed@debian.org>]

Control: tags 765490 + pending

Dear maintainer,

I've prepared an NMU for xserver-xorg-video-vmware (versioned as 1:13.0.2-3.1) and
uploaded it to unstable. I'll ask for an unblock.

Regards.

Bernd

diff -u xserver-xorg-video-vmware-13.0.2/debian/changelog xserver-xorg-video-vmware-13.0.2/debian/changelog
--- xserver-xorg-video-vmware-13.0.2/debian/changelog
+++ xserver-xorg-video-vmware-13.0.2/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-vmware (1:13.0.2-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload as requested by jcristau.
+  * Fixing resizing issues & xorg being stuck in a loop at logoff.
+    (Closes: #765490)
+    Patch 32562129750077a23f26f2e69adc8403eb24bf3f from upstream.
+  * Fixing an array out of bounds indexing, upstream
+    b1697434348799b0808a6c9e9a899394075b980c.
+
+ -- Bernd Zeimetz <bzed@debian.org>  Sat, 14 Mar 2015 22:57:20 +0100
+
 xserver-xorg-video-vmware (1:13.0.2-3) unstable; urgency=medium
 
   * rules: avoid mixing implicit and normal rules; make 4 doesn't like that
diff -u xserver-xorg-video-vmware-13.0.2/debian/patches/series xserver-xorg-video-vmware-13.0.2/debian/patches/series
--- xserver-xorg-video-vmware-13.0.2/debian/patches/series
+++ xserver-xorg-video-vmware-13.0.2/debian/patches/series
@@ -1 +1,2 @@
-# placeholder
+32562129750077a23f26f2e69adc8403eb24bf3f.patch
+b1697434348799b0808a6c9e9a899394075b980c.patch
only in patch2:
unchanged:
--- xserver-xorg-video-vmware-13.0.2.orig/debian/patches/32562129750077a23f26f2e69adc8403eb24bf3f.patch
+++ xserver-xorg-video-vmware-13.0.2/debian/patches/32562129750077a23f26f2e69adc8403eb24bf3f.patch
@@ -0,0 +1,29 @@
+From 32562129750077a23f26f2e69adc8403eb24bf3f Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 3 Sep 2014 07:08:41 -0700
+Subject: vmware/vmwgfx: Don't add pixmaps to the pixmap list if they're
+ already on it
+
+This could cause loops through the list to spin indefinitely.
+This would most likely occur at VT switches.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index b9204c6..bca3d93 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -694,7 +694,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth,
+ 
+     vmwgfx_pix_resize(pixmap, old_pitch, old_height, old_width);
+     vmwgfx_pixmap_free_storage(vpix);
+-    WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps);
++    if (WSBMLISTEMPTY(&vpix->pixmap_list))
++	WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps);
+ 
+     return TRUE;
+ 
+-- 
+cgit v0.10.2
+
only in patch2:
unchanged:
--- xserver-xorg-video-vmware-13.0.2.orig/debian/patches/b1697434348799b0808a6c9e9a899394075b980c.patch
+++ xserver-xorg-video-vmware-13.0.2/debian/patches/b1697434348799b0808a6c9e9a899394075b980c.patch
@@ -0,0 +1,27 @@
+From b1697434348799b0808a6c9e9a899394075b980c Mon Sep 17 00:00:00 2001
+From: Jakob Bornecrantz <jakob@vmware.com>
+Date: Thu, 14 Aug 2014 16:42:05 +0200
+Subject: vmware/legacy: Fix out of bound array indexing
+
+Spotted by coverity.
+
+Reported-by: Adam Jackson <ajax@redhat.com>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+
+diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
+index 261e579..816f1ca 100644
+--- a/src/vmwarevideo.c
++++ b/src/vmwarevideo.c
+@@ -837,7 +837,7 @@ vmwareVideoPlay(ScrnInfoPtr pScrn, VMWAREVideoPtr pVid,
+     cmdSetRegs.body.streamId = pVid->streamId;
+ 
+     items = cmdSetRegs.body.items;
+-    for (i = SVGA_VIDEO_ENABLED; i < SVGA_VIDEO_NUM_REGS; i++) {
++    for (i = SVGA_VIDEO_ENABLED; i < SVGA_VIDEO_DATA_GMRID; i++) {
+         items[i].regId = i;
+     }
+ 
+-- 
+cgit v0.10.2
+