Julien Cristau pushed to branch debian-unstable at X Strike Force / lib / libx11
Commits: 54119952 by Julien Cristau at 2020-08-02T19:03:31+02:00 Fix regression introduced in 1.6.10 (closes: #966691) - - - - - 3 changed files: - debian/changelog - + debian/patches/001_xim_regression.diff - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +libx11 (2:1.6.10-2) unstable; urgency=medium + + * Fix regression introduced in 1.6.10 (closes: #966691) + + -- Julien Cristau <jcris...@debian.org> Sun, 02 Aug 2020 18:58:23 +0200 + libx11 (2:1.6.10-1) unstable; urgency=medium * New upstream release ===================================== debian/patches/001_xim_regression.diff ===================================== @@ -0,0 +1,28 @@ +Subject: Fix regression from commit 388b303 + +References: +https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/116 +https://bugs.debian.org/966691 + +diff --git a/modules/im/ximcp/imRmAttr.c b/modules/im/ximcp/imRmAttr.c +index 2491908e..e10048f9 100644 +--- a/modules/im/ximcp/imRmAttr.c ++++ b/modules/im/ximcp/imRmAttr.c +@@ -265,7 +265,7 @@ _XimAttributeToValue( + + if (num > (USHRT_MAX / sizeof(XIMStyle))) + return False; +- if ((sizeof(num) + (num * sizeof(XIMStyle))) > data_len) ++ if ((2 * sizeof(CARD16) + (num * sizeof(CARD32) > data_len) + return False; + alloc_len = sizeof(XIMStyles) + sizeof(XIMStyle) * num; + if (alloc_len < sizeof(XIMStyles)) +@@ -379,7 +379,7 @@ _XimAttributeToValue( + + if (num > (UINT_MAX / sizeof(XIMHotKeyTrigger))) + return False; +- if ((sizeof(num) + (num * sizeof(XIMHotKeyTrigger))) > data_len) ++ if ((2 * sizeof(CARD16) + (num * 3 * sizeof(CARD32))) > data_len) + return False; + alloc_len = sizeof(XIMHotKeyTriggers) + + sizeof(XIMHotKeyTrigger) * num; ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ +001_xim_regression.diff 003_recognize_glibc_2.3.2_locale_names.diff 007_iso8859-15_Compose_fix.diff 008_remove_ko_Compose.diff View it on GitLab: https://salsa.debian.org/xorg-team/lib/libx11/-/commit/541199527b5aed6f4f9ba5bf7bf67796891700bb -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/libx11/-/commit/541199527b5aed6f4f9ba5bf7bf67796891700bb You're receiving this email because of your account on salsa.debian.org.
