commit 7c56b4c332c2bfadc851375b0d38b6991ea81a7a
author Tim Waugh <twaugh@redhat.com> Fri Oct 17 10:28:55 2014 +0100
committer Tim Waugh <twaugh@redhat.com> Fri Oct 17 10:28:55 2014 +0100
tree eedff1511f164470543799383852595bed3f7ea9
parent b17c9c4dedf09873b10b3c23d5f189aa9eba6978

Check the return value from XShmAttach.

vncviewer/X11PixelBuffer.cxx

diff --git a/vncviewer/X11PixelBuffer.cxx b/vncviewer/X11PixelBuffer.cxx
index f83aa5f..a779427 100644
--- a/vncviewer/X11PixelBuffer.cxx
+++ b/vncviewer/X11PixelBuffer.cxx
@@ -189,7 +189,11 @@
   caughtError = false;
   old_handler = XSetErrorHandler(XShmAttachErrorHandler);
 
-  XShmAttach(fl_display, shminfo);
+  if (!XShmAttach(fl_display, shminfo)) {
+    XSetErrorHandler(old_handler);
+    goto free_shmaddr;
+  }
+
   XSync(fl_display, False);
 
   XSetErrorHandler(old_handler);