mirror of
https://gitlab.freedesktop.org/xorg/lib/libx11.git
synced 2026-05-26 21:48:23 +02:00
f3d6ebac35
Commit 1472048b7 to fix a colormap threading issue added a display
lock/unlock and a call to SyncHandle() to _XcmsFreeClientCmaps().
When running synchronized, that means calling XSync().
_XcmsFreeClientCmaps() is called from _XFreeDisplayStructure() via
XCloseDisplay() after the xcb connection is closed.
So when running synchronized, we may end up calling XSync() after the
xcb connection to the display is closed, which will generate a spurious
XIO error:
| #0 in _XDefaultIOError () at /lib64/libX11.so.6
| #1 in _XIOError () at /lib64/libX11.so.6
| #2 in _XReply () at /lib64/libX11.so.6
| #3 in XSync () at /lib64/libX11.so.6
| #4 in _XSyncFunction () at /lib64/libX11.so.6
| 8#5 in _XFreeDisplayStructure () at /lib64/libX11.so.6
| 8#6 in XCloseDisplay () at /lib64/libX11.so.6
To avoid that issue, closed the xcb connection to the display last.
v2: And same in OutOfMemory() as well (José Expósito)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: José Expósito <jexposit@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/264>
76 lines
2.4 KiB
C
76 lines
2.4 KiB
C
|
|
/*
|
|
|
|
Copyright 1985, 1990, 1998 The Open Group
|
|
|
|
Permission to use, copy, modify, distribute, and sell this software and its
|
|
documentation for any purpose is hereby granted without fee, provided that
|
|
the above copyright notice appear in all copies and that both that
|
|
copyright notice and this permission notice appear in supporting
|
|
documentation.
|
|
|
|
The above copyright notice and this permission notice shall be included
|
|
in all copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
Except as contained in this notice, the name of The Open Group shall
|
|
not be used in advertising or otherwise to promote the sale, use or
|
|
other dealings in this Software without prior written authorization
|
|
from The Open Group.
|
|
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
#include "Xxcbint.h"
|
|
#include "Xlib.h"
|
|
#include "Xlibint.h"
|
|
#include "Xintconn.h"
|
|
|
|
/*
|
|
* XCloseDisplay - XSync the connection to the X Server, close the connection,
|
|
* and free all associated storage. Extension close procs should only free
|
|
* memory and must be careful about the types of requests they generate.
|
|
*/
|
|
|
|
int
|
|
XCloseDisplay (
|
|
register Display *dpy)
|
|
{
|
|
register _XExtension *ext;
|
|
register int i;
|
|
xcb_connection_t *connection;
|
|
|
|
if (!(dpy->flags & XlibDisplayClosing))
|
|
{
|
|
dpy->flags |= XlibDisplayClosing;
|
|
for (i = 0; i < dpy->nscreens; i++) {
|
|
register Screen *sp = &dpy->screens[i];
|
|
XFreeGC (dpy, sp->default_gc);
|
|
}
|
|
if (dpy->cursor_font != None) {
|
|
XUnloadFont (dpy, dpy->cursor_font);
|
|
}
|
|
XSync(dpy, 1); /* throw away pending events, catch errors */
|
|
/* call out to any extensions interested */
|
|
for (ext = dpy->ext_procs; ext; ext = ext->next) {
|
|
if (ext->close_display)
|
|
(*ext->close_display)(dpy, &ext->codes);
|
|
}
|
|
/* if the closes generated more protocol, sync them up */
|
|
if (X_DPY_GET_REQUEST(dpy) != X_DPY_GET_LAST_REQUEST_READ(dpy))
|
|
XSync(dpy, 1);
|
|
}
|
|
connection = dpy->xcb->connection;
|
|
_XFreeDisplayStructure (dpy);
|
|
xcb_disconnect(connection);
|
|
return 0;
|
|
}
|