Index: dlls/x11drv/clipboard.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/clipboard.c,v
retrieving revision 1.51
diff -d -u -r1.51 clipboard.c
--- dlls/x11drv/clipboard.c	22 Feb 2006 21:31:52 -0000	1.51
+++ dlls/x11drv/clipboard.c	8 Apr 2006 23:33:23 -0000
@@ -1773,7 +1773,14 @@
              /* add it to the list of atoms that we don't know about yet */
              if (!atoms) atoms = HeapAlloc( GetProcessHeap(), 0,
                                             (count - i) * sizeof(*atoms) );
-             if (atoms) atoms[nb_atoms++] = properties[i];
+	     /* FIXME: some selection client out there is reporting atom 0,
+	      * and calling XGetAtomNames for atom 0 causes a BadAtom error
+	      * and aborts the app!  So kludgily ignore atom 0.
+	      * dank@kegel.com
+	      */
+	     if (properties[i] == 0) {
+                 TRACE("Refusing to look up atom 0\n");
+	     } else if (atoms) atoms[nb_atoms++] = properties[i];
          }
      }