diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-08-02 18:20:30 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-08-03 08:59:53 +0200 |
| commit | 123fd2183361a2d5e244e28a603567a2e6f30314 (patch) | |
| tree | c5f2b25fd440ee9ccdf3ff740b6dc560d17b032c /source/x/x11 | |
| parent | 7146524f273ad7add0d5b533156d35d07896ed8c (diff) | |
| download | current-123fd2183361a2d5e244e28a603567a2e6f30314.tar.gz | |
Sun Aug 2 18:20:30 UTC 202020200802182030
d/bison-3.7.1-x86_64-1.txz: Upgraded.
d/python-setuptools-49.2.1-x86_64-1.txz: Upgraded.
l/libcap-2.42-x86_64-1.txz: Upgraded.
x/libX11-1.6.10-x86_64-2.txz: Rebuilt.
Fix size calculation in _XimAttributeToValue.
Thanks to chrisVV and Yichao Yu.
extra/xfractint/xfractint-20.04p16-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/x11')
| -rw-r--r-- | source/x/x11/build/libX11 | 2 | ||||
| -rw-r--r-- | source/x/x11/patch/libX11.patch | 1 | ||||
| -rw-r--r-- | source/x/x11/patch/libX11/libX11.fix_size.diff | 20 |
3 files changed, 22 insertions, 1 deletions
diff --git a/source/x/x11/build/libX11 b/source/x/x11/build/libX11 index d00491fd..0cfbf088 100644 --- a/source/x/x11/build/libX11 +++ b/source/x/x11/build/libX11 @@ -1 +1 @@ -1 +2 diff --git a/source/x/x11/patch/libX11.patch b/source/x/x11/patch/libX11.patch new file mode 100644 index 00000000..c69e0e2d --- /dev/null +++ b/source/x/x11/patch/libX11.patch @@ -0,0 +1 @@ +zcat $CWD/patch/libX11/libX11.fix_size.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/libX11/libX11.fix_size.diff b/source/x/x11/patch/libX11/libX11.fix_size.diff new file mode 100644 index 00000000..ab2a0cf7 --- /dev/null +++ b/source/x/x11/patch/libX11/libX11.fix_size.diff @@ -0,0 +1,20 @@ +--- ./modules/im/ximcp/imRmAttr.c.orig 2020-07-31 08:46:40.000000000 -0500 ++++ ./modules/im/ximcp/imRmAttr.c 2020-08-02 13:07:15.343940851 -0500 +@@ -265,7 +265,7 @@ + + 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 @@ + + 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; |