Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / libx11
Commits: 76d1cc3c by Simon McVittie at 2022-04-03T14:24:13+01:00 Don't try to destroy NULL condition variables This avoids a segfault during error-unwinding if an invalid display name is passed to XOpenDisplay(). Fixes: 8a368d80 "Fix two memory leaks in _XFreeX11XCBStructure()" Resolves: #155 Signed-off-by: Simon McVittie <[email protected]> - - - - - 9ac6859c by Matt Turner at 2022-04-03T10:15:30-07:00 libX11 1.7.5 Signed-off-by: Matt Turner <[email protected]> - - - - - 2 changed files: - configure.ac - src/xcb_disp.c Changes: ===================================== configure.ac ===================================== @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libX11], [1.7.4], +AC_INIT([libX11], [1.7.5], [https://gitlab.freedesktop.org/xorg/lib/libx11/issues], [libX11]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h]) ===================================== src/xcb_disp.c ===================================== @@ -102,8 +102,10 @@ void _XFreeX11XCBStructure(Display *dpy) dpy->xcb->pending_requests = tmp->next; free(tmp); } - xcondition_clear(dpy->xcb->event_notify); - xcondition_clear(dpy->xcb->reply_notify); + if (dpy->xcb->event_notify) + xcondition_clear(dpy->xcb->event_notify); + if (dpy->xcb->reply_notify) + xcondition_clear(dpy->xcb->reply_notify); xcondition_free(dpy->xcb->event_notify); xcondition_free(dpy->xcb->reply_notify); Xfree(dpy->xcb); View it on GitLab: https://salsa.debian.org/xorg-team/lib/libx11/-/compare/80b30d12519ac54fc5b2b05500521d9c8269be9c...9ac6859c20be2fc5e70c2908de60c6e466ec04e1 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/libx11/-/compare/80b30d12519ac54fc5b2b05500521d9c8269be9c...9ac6859c20be2fc5e70c2908de60c6e466ec04e1 You're receiving this email because of your account on salsa.debian.org.
