Julien Cristau pushed to branch debian-unstable at X Strike Force / app / x11-xkb-utils
Commits: 2e4db4c2 by Julien Cristau at 2022-04-25T18:50:36+02:00 Fix Vcs-Git URL - - - - - 7ac3d7fd by Julien Cristau at 2022-04-25T18:53:23+02:00 Fix setxkbmap crash in d-i (closes: #1010161) - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/01_Be-more-careful-about-querying-randr.diff - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +x11-xkb-utils (7.7+7) unstable; urgency=medium + + * Fix setxkbmap crash in d-i (closes: #1010161) + + -- Julien Cristau <jcris...@debian.org> Mon, 25 Apr 2022 18:53:16 +0200 + x11-xkb-utils (7.7+6) unstable; urgency=medium [ Jelmer Vernooij ] ===================================== debian/control ===================================== @@ -22,7 +22,7 @@ Build-Depends: # xkbprint: libx11-dev, libxkbfile-dev # xkbutils: libx11-dev, libxaw7-dev, x11proto-core-dev Standards-Version: 4.5.0 -Vcs-Git: https://salsa.debian.org/xorg-team/app/x11-xkb-utils +Vcs-Git: https://salsa.debian.org/xorg-team/app/x11-xkb-utils.git Vcs-Browser: https://salsa.debian.org/xorg-team/app/x11-xkb-utils Package: x11-xkb-utils ===================================== debian/patches/01_Be-more-careful-about-querying-randr.diff ===================================== @@ -0,0 +1,36 @@ +From 1c5597c529a8a8f836cd4da6e22e65c74c588064 Mon Sep 17 00:00:00 2001 +From: Julien Cristau <jcris...@debian.org> +Date: Mon, 25 Apr 2022 15:41:26 +0200 +Subject: [PATCH app/setxkbmap] Be more careful about querying randr + +Check for extension version and number of outputs: +XRRGetScreenResourcesCurrent was added in v1.3. Also, there's no +guarantee it returns any outputs, and we don't want to die with a +BadRROutput error. +--- + setxkbmap.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +Forwarded: https://gitlab.freedesktop.org/xorg/app/setxkbmap/-/merge_requests/4 + +diff --git a/setxkbmap/setxkbmap.c b/setxkbmap/setxkbmap.c +index 96761a0..6b6259c 100644 +--- a/setxkbmap/setxkbmap.c ++++ b/setxkbmap/setxkbmap.c +@@ -1090,9 +1090,12 @@ is_xwayland(void) + /* e.g. Xnest, but definitely not Xwayland */ + goto out; + } ++ if (major < 1 || (major == 1 && minor < 3)) { ++ goto out; ++ } + + resources = XRRGetScreenResourcesCurrent(dpy, DefaultRootWindow(dpy)); +- if (!resources) { ++ if (!resources || resources->noutput < 1) { + goto out; + } + +-- +2.30.2 + ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ +01_Be-more-careful-about-querying-randr.diff #11_xkb_documentation_updates.diff -p0 View it on GitLab: https://salsa.debian.org/xorg-team/app/x11-xkb-utils/-/compare/51fb881021e8f6f1b01cc546244da5ce99b80e77...7ac3d7fd8f029a6dba58960ce3e27bab8b9da91b -- View it on GitLab: https://salsa.debian.org/xorg-team/app/x11-xkb-utils/-/compare/51fb881021e8f6f1b01cc546244da5ce99b80e77...7ac3d7fd8f029a6dba58960ce3e27bab8b9da91b You're receiving this email because of your account on salsa.debian.org.
