libX11: Changes to 'master'

[GitLab Mirror]

 src/ClDisplay.c |    4 +++-
 src/OpenDis.c   |    9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 19b2f5c2d0935cbf9c17ecf30604f80592807b59
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Fri Aug 9 10:24:13 2024 +0200

    Fix indentation
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/264>

commit f3d6ebac35301d4ad068e307f0fbe6aa12ccbccb
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Fri Aug 9 09:21:31 2024 +0200

    Close xcb connection after freeing display structure
    
    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 at redhat.com>
    Reviewed-by: José Expósito <jexposit at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/264>