[tigervnc] Fixed viewer crash when cursor has not been set (bug #1038701).

[Tim Waugh]

commit 8ef823f6eecbbde4ed907347dcad74df6139a0b3
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Jan 10 11:04:51 2014 +0000

    Fixed viewer crash when cursor has not been set (bug #1038701).
    
    Resolves: rhbz#1038701

 tigervnc-cursor.patch |   12 ++++++++++++
 tigervnc.spec         |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/tigervnc-cursor.patch b/tigervnc-cursor.patch
new file mode 100644
index 0000000..349c950
--- /dev/null
+++ b/tigervnc-cursor.patch
@@ -0,0 +1,12 @@
+diff -up tigervnc-1.3.0/vncviewer/Viewport.cxx.cursor tigervnc-1.3.0/vncviewer/Viewport.cxx
+--- tigervnc-1.3.0/vncviewer/Viewport.cxx.cursor	2013-12-17 13:28:23.170400013 +0000
++++ tigervnc-1.3.0/vncviewer/Viewport.cxx	2013-12-17 13:29:46.095784064 +0000
+@@ -931,7 +931,7 @@ void Viewport::popupContextMenu()
+ 
+   // Back to our proper mouse pointer.
+ #ifdef HAVE_FLTK_CURSOR
+-  if (Fl::belowmouse() == this)
++  if (Fl::belowmouse() == this && cursor)
+     window()->cursor(cursor, cursorHotspot.x, cursorHotspot.y);
+ #endif
+ 
diff --git a/tigervnc.spec b/tigervnc.spec
index f5e7105..abcd074 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.3.0
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -49,6 +49,7 @@ Patch9:		tigervnc-shebang.patch
 Patch10:	tigervnc-1.3.0-xserver-1.15.patch
 Patch11:	tigervnc-format-security.patch
 Patch12:	tigervnc-zrle-crash.patch
+Patch13:	tigervnc-cursor.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -179,6 +180,9 @@ popd
 # Avoid invalid read when ZRLE connection closed (upstream bug #133).
 %patch12 -p1 -b .zrle-crash
 
+# Fixed viewer crash when cursor has not been set (bug #1038701).
+%patch13 -p1 -b .cursor
+
 %build
 %ifarch sparcv9 sparc64 s390 s390x
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -351,6 +355,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Jan 10 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-11
+- Fixed viewer crash when cursor has not been set (bug #1038701).
+
 * Thu Dec 12 2013 Tim Waugh <twaugh at redhat.com> 1.3.0-10
 - Avoid invalid read when ZRLE connection closed (upstream bug #133).