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
3 changed files:
Changes:
| 1 |
+libx11 (2:1.6.10-2) unstable; urgency=medium
|
|
| 2 |
+ |
|
| 3 |
+ * Fix regression introduced in 1.6.10 (closes: #966691)
|
|
| 4 |
+ |
|
| 5 |
+ -- Julien Cristau <jcristau@debian.org> Sun, 02 Aug 2020 18:58:23 +0200
|
|
| 6 |
+ |
|
| 1 | 7 |
libx11 (2:1.6.10-1) unstable; urgency=medium
|
| 2 | 8 |
|
| 3 | 9 |
* New upstream release
|
| 1 |
+Subject: Fix regression from commit 388b303
|
|
| 2 |
+ |
|
| 3 |
+References:
|
|
| 4 |
+https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/116
|
|
| 5 |
+https://bugs.debian.org/966691
|
|
| 6 |
+ |
|
| 7 |
+diff --git a/modules/im/ximcp/imRmAttr.c b/modules/im/ximcp/imRmAttr.c
|
|
| 8 |
+index 2491908e..e10048f9 100644
|
|
| 9 |
+--- a/modules/im/ximcp/imRmAttr.c
|
|
| 10 |
++++ b/modules/im/ximcp/imRmAttr.c
|
|
| 11 |
+@@ -265,7 +265,7 @@ _XimAttributeToValue(
|
|
| 12 |
+
|
|
| 13 |
+ if (num > (USHRT_MAX / sizeof(XIMStyle)))
|
|
| 14 |
+ return False;
|
|
| 15 |
+- if ((sizeof(num) + (num * sizeof(XIMStyle))) > data_len)
|
|
| 16 |
++ if ((2 * sizeof(CARD16) + (num * sizeof(CARD32) > data_len)
|
|
| 17 |
+ return False;
|
|
| 18 |
+ alloc_len = sizeof(XIMStyles) + sizeof(XIMStyle) * num;
|
|
| 19 |
+ if (alloc_len < sizeof(XIMStyles))
|
|
| 20 |
+@@ -379,7 +379,7 @@ _XimAttributeToValue(
|
|
| 21 |
+
|
|
| 22 |
+ if (num > (UINT_MAX / sizeof(XIMHotKeyTrigger)))
|
|
| 23 |
+ return False;
|
|
| 24 |
+- if ((sizeof(num) + (num * sizeof(XIMHotKeyTrigger))) > data_len)
|
|
| 25 |
++ if ((2 * sizeof(CARD16) + (num * 3 * sizeof(CARD32))) > data_len)
|
|
| 26 |
+ return False;
|
|
| 27 |
+ alloc_len = sizeof(XIMHotKeyTriggers)
|
|
| 28 |
+ + sizeof(XIMHotKeyTrigger) * num;
|
| 1 |
+001_xim_regression.diff
|
|
| 1 | 2 |
003_recognize_glibc_2.3.2_locale_names.diff
|
| 2 | 3 |
007_iso8859-15_Compose_fix.diff
|
| 3 | 4 |
008_remove_ko_Compose.diff
|