Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/xorg]: xsrc/external/mit/libX11/dist initial import of libX11-1.6.12
details: https://anonhg.NetBSD.org/xsrc/rev/d7779bdbe0cd
branches: xorg
changeset: 10552:d7779bdbe0cd
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Aug 30 04:52:40 2020 +0000
description:
initial import of libX11-1.6.12
diffstat:
external/mit/libX11/dist/ChangeLog | 88 +++++++++++++++++
external/mit/libX11/dist/configure | 20 +-
external/mit/libX11/dist/configure.ac | 2 +-
external/mit/libX11/dist/include/X11/XKBlib.h | 2 +-
external/mit/libX11/dist/man/XCreateGC.man | 2 +-
external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c | 6 +-
external/mit/libX11/dist/modules/om/generic/omGeneric.c | 3 +-
external/mit/libX11/dist/src/GetStCmap.c | 3 +-
external/mit/libX11/dist/src/xkb/XKBBind.c | 4 +-
9 files changed, 109 insertions(+), 21 deletions(-)
diffs (290 lines):
diff -r eae4928bfb5b -r d7779bdbe0cd external/mit/libX11/dist/ChangeLog
--- a/external/mit/libX11/dist/ChangeLog Sat Aug 29 05:57:09 2020 +0000
+++ b/external/mit/libX11/dist/ChangeLog Sun Aug 30 04:52:40 2020 +0000
@@ -1,3 +1,91 @@
+commit 505420662577749e36640db48f6b6b9ae0236e09
+Author: Matthieu Herrb <matthieu%herrb.eu@localhost>
+Date: Mon Aug 24 15:42:25 2020 +0200
+
+ libX11 1.6.12
+
+ Signed-off-by: Matthieu Herrb <matthieu%herrb.eu@localhost>
+
+commit acdaaadcb3d85c61fd43669fc5dddf0f8c3f911d
+Author: Matthieu Herrb <matthieu%herrb.eu@localhost>
+Date: Thu Aug 13 18:02:58 2020 +0200
+
+ Fix an integer overflow in init_om()
+
+ CVE-2020-14363
+
+ This can lead to a double free later, as reported by Jayden Rivers.
+
+ Signed-off-by: Matthieu Herrb <matthieu%herrb.eu@localhost>
+
+commit d15c24c8b44be5e4054c8ecd0ff9dcf2c8e18e5b
+Author: Niclas Zeising <zeising%daemonic.se@localhost>
+Date: Tue Aug 11 13:44:38 2020 +0200
+
+ Fix input clients connecting to server
+
+ Fix a bug where some input clients can't connect to the input server.
+ This fixes #117.
+
+ FreeBSD bugzilla reference:
+ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=248549
+
+ Signed-off-by: Niclas Zeising <zeising%daemonic.se@localhost>
+
+commit 6dd618e5ea8e7558dd8e99a2777ab7b69211789c
+Author: Maya Rashish <maya%NetBSD.org@localhost>
+Date: Sat Aug 15 00:48:56 2020 +0300
+
+ Avoid the use of "register" keyword in XkbTranslateKeySym.
+
+ This causes issues when compiling code for C++17.
+ While here, make function prototype match the header with regards
+ to removal of another register keyword.
+
+commit 780d222343098b4bfe3ec529b4a0dc2aadea19bf
+Author: Christopher Chavez <chrischavez%gmx.us@localhost>
+Date: Mon Aug 10 17:08:39 2020 +0000
+
+ Fix typo GCCLipYOrigin -> GCClipYOrigin in XCreateGC() manpage
+
+commit 29a8251a456bb7dc10146b4713f499a624d6dacd
+Author: Felix Yan <felixonmars%archlinux.org@localhost>
+Date: Thu Aug 6 16:03:38 2020 +0000
+
+ Correct a typo in GetStCmap.c
+
+commit 0d8f038db83f68724a84ef9d4ccd0d5e33ec6a70
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Thu Aug 6 08:07:57 2020 -0700
+
+ libX11 1.6.11
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 93fce3f4e79cbc737d6468a4f68ba3de1b83953b
+Author: Yichao Yu <yyc1992%gmail.com@localhost>
+Date: Sun Aug 2 13:43:58 2020 -0400
+
+ Fix size calculation in `_XimAttributeToValue`.
+
+ The check here guards the read below.
+ For `XimType_XIMStyles`, these are `num` of `CARD32` and for `XimType_XIMHotKeyTriggers`
+ these are `num` of `XIMTRIGGERKEY` ref[1] which is defined as 3 x `CARD32`.
+ (There are data after the `XIMTRIGGERKEY` according to the spec but they are not read by this
+ function and doesn't need to be checked.)
+
+ The old code here used the native datatype size instead of the wire protocol size causing
+ the check to always fail.
+
+ Also fix the size calculation for the header (size). It is 2 x CARD16 for both types
+ despite the unused `CARD16` for `XimType_XIMStyles`.
+
+ [1] https://www.x.org/releases/X11R7.6/doc/libX11/specs/XIM/xim.html#Input_Method_Styles
+
+ This fixes a regression caused by 388b303c62aa35a245f1704211a023440ad2c488 in 1.6.10.
+
+ Fix #116
+
commit 9949364ea761ab7efa2a9930ec7718f966a740c0
Author: Matthieu Herrb <matthieu%herrb.eu@localhost>
Date: Thu Jul 30 21:36:22 2020 +0200
diff -r eae4928bfb5b -r d7779bdbe0cd external/mit/libX11/dist/configure
--- a/external/mit/libX11/dist/configure Sat Aug 29 05:57:09 2020 +0000
+++ b/external/mit/libX11/dist/configure Sun Aug 30 04:52:40 2020 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libX11 1.6.10.
+# Generated by GNU Autoconf 2.69 for libX11 1.6.12.
#
# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libx11/issues>.
#
@@ -651,8 +651,8 @@
# Identity of this package.
PACKAGE_NAME='libX11'
PACKAGE_TARNAME='libX11'
-PACKAGE_VERSION='1.6.10'
-PACKAGE_STRING='libX11 1.6.10'
+PACKAGE_VERSION='1.6.12'
+PACKAGE_STRING='libX11 1.6.12'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libx11/issues'
PACKAGE_URL=''
@@ -1522,7 +1522,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libX11 1.6.10 to adapt to many kinds of systems.
+\`configure' configures libX11 1.6.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1593,7 +1593,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libX11 1.6.10:";;
+ short | recursive ) echo "Configuration of libX11 1.6.12:";;
esac
cat <<\_ACEOF
@@ -1762,7 +1762,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libX11 configure 1.6.10
+libX11 configure 1.6.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2288,7 +2288,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libX11 $as_me 1.6.10, which was
+It was created by libX11 $as_me 1.6.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4604,7 +4604,7 @@
# Define the identity of the package.
PACKAGE='libX11'
- VERSION='1.6.10'
+ VERSION='1.6.12'
cat >>confdefs.h <<_ACEOF
@@ -22354,7 +22354,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libX11 $as_me 1.6.10, which was
+This file was extended by libX11 $as_me 1.6.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22420,7 +22420,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libX11 config.status 1.6.10
+libX11 config.status 1.6.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -r eae4928bfb5b -r d7779bdbe0cd external/mit/libX11/dist/configure.ac
--- a/external/mit/libX11/dist/configure.ac Sat Aug 29 05:57:09 2020 +0000
+++ b/external/mit/libX11/dist/configure.ac Sun Aug 30 04:52:40 2020 +0000
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libX11], [1.6.10],
+AC_INIT([libX11], [1.6.12],
[https://gitlab.freedesktop.org/xorg/lib/libx11/issues], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
diff -r eae4928bfb5b -r d7779bdbe0cd external/mit/libX11/dist/include/X11/XKBlib.h
--- a/external/mit/libX11/dist/include/X11/XKBlib.h Sat Aug 29 05:57:09 2020 +0000
+++ b/external/mit/libX11/dist/include/X11/XKBlib.h Sun Aug 30 04:52:40 2020 +0000
@@ -396,7 +396,7 @@
extern int XkbTranslateKeySym(
Display * /* dpy */,
- register KeySym * /* sym_return */,
+ KeySym * /* sym_return */,
unsigned int /* modifiers */,
char * /* buffer */,
int /* nbytes */,
diff -r eae4928bfb5b -r d7779bdbe0cd external/mit/libX11/dist/man/XCreateGC.man
--- a/external/mit/libX11/dist/man/XCreateGC.man Sat Aug 29 05:57:09 2020 +0000
+++ b/external/mit/libX11/dist/man/XCreateGC.man Sun Aug 30 04:52:40 2020 +0000
@@ -178,7 +178,7 @@
.BR GCSubwindowMode ,
.BR GCGraphicsExposures ,
.BR GCClipXOrigin ,
-.BR GCCLipYOrigin ,
+.BR GCClipYOrigin ,
.BR GCDashOffset ,
or
.BR GCArcMode )
diff -r eae4928bfb5b -r d7779bdbe0cd external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c
--- a/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c Sat Aug 29 05:57:09 2020 +0000
+++ b/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c Sun Aug 30 04:52:40 2020 +0000
@@ -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;
@@ -1407,7 +1407,7 @@
*names_len = 0;
while (total > min_len) {
len = attr[2];
- if (len >= (total - min_len)) {
+ if (len > (total - min_len)) {
return 0;
}
*names_len += (len + 1);
diff -r eae4928bfb5b -r d7779bdbe0cd external/mit/libX11/dist/modules/om/generic/omGeneric.c
--- a/external/mit/libX11/dist/modules/om/generic/omGeneric.c Sat Aug 29 05:57:09 2020 +0000
+++ b/external/mit/libX11/dist/modules/om/generic/omGeneric.c Sun Aug 30 04:52:40 2020 +0000
@@ -1908,7 +1908,8 @@
char **required_list;
XOrientation *orientation;
char **value, buf[BUFSIZ], *bufptr;
- int count = 0, num = 0, length = 0;
+ int count = 0, num = 0;
+ unsigned int length = 0;
_XlcGetResource(lcd, "XLC_FONTSET", "on_demand_loading", &value, &count);
if (count > 0 && _XlcCompareISOLatin1(*value, "True") == 0)
diff -r eae4928bfb5b -r d7779bdbe0cd external/mit/libX11/dist/src/GetStCmap.c
--- a/external/mit/libX11/dist/src/GetStCmap.c Sat Aug 29 05:57:09 2020 +0000
+++ b/external/mit/libX11/dist/src/GetStCmap.c Sun Aug 30 04:52:40 2020 +0000
@@ -1,4 +1,3 @@
-
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -111,7 +110,7 @@
cmap->blue_mult = use->blue_mult;
cmap->base_pixel = use->base_pixel;
- Xfree (stdcmaps); /* don't need alloced memory */
+ Xfree (stdcmaps); /* don't need allocated memory */
}
return stat;
}
diff -r eae4928bfb5b -r d7779bdbe0cd external/mit/libX11/dist/src/xkb/XKBBind.c
--- a/external/mit/libX11/dist/src/xkb/XKBBind.c Sat Aug 29 05:57:09 2020 +0000
+++ b/external/mit/libX11/dist/src/xkb/XKBBind.c Sun Aug 30 04:52:40 2020 +0000
@@ -587,8 +587,8 @@
}
int
-XkbTranslateKeySym(register Display *dpy,
- register KeySym *sym_rtrn,
+XkbTranslateKeySym(Display *dpy,
+ KeySym *sym_rtrn,
unsigned int mods,
char *buffer,
int nbytes,
Home |
Main Index |
Thread Index |
Old Index