[Git][xorg-team/lib/libx11][upstream-unstable] 2 commits: Don't try to destroy NULL condition variables

["Timo Aaltonen (@tjaalton)" <tjaalton@debian.org>]

Title: GitLab

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 <smcv@debian.org>
  

• 9ac6859c
  by Matt Turner at 2022-04-03T10:15:30-07:00

  libX11 1.7.5
  
  Signed-off-by: Matt Turner <mattst88@gmail.com>
  

2 changed files:

• configure.ac
• src/xcb_disp.c

Changes:

configure.ac

---

1	1
2	2	# Initialize Autoconf
3	3	AC_PREREQ([2.60])
4		-AC_INIT([libX11], [1.7.4],
	4	+AC_INIT([libX11], [1.7.5],
5	5	[https://gitlab.freedesktop.org/xorg/lib/libx11/issues], [libX11])
6	6	AC_CONFIG_SRCDIR([Makefile.am])
7	7	AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])

src/xcb_disp.c

---

...	...	@@ -102,8 +102,10 @@ void _XFreeX11XCBStructure(Display *dpy)
102	102	dpy->xcb->pending_requests = tmp->next;
103	103	free(tmp);
104	104	}
105		- xcondition_clear(dpy->xcb->event_notify);
106		- xcondition_clear(dpy->xcb->reply_notify);
	105	+ if (dpy->xcb->event_notify)
	106	+ xcondition_clear(dpy->xcb->event_notify);
	107	+ if (dpy->xcb->reply_notify)
	108	+ xcondition_clear(dpy->xcb->reply_notify);
107	109	xcondition_free(dpy->xcb->event_notify);
108	110	xcondition_free(dpy->xcb->reply_notify);
109	111	Xfree(dpy->xcb);

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.