qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to libXi 1.7.9

Browse Source
This commit is contained in:
matthieu 2017-02-19 17:41:29 +00:00
parent 8b92839868
commit 5b71eebdaa
4 changed files with 67 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/libXi/ChangeLog
View File

@ -1,3 +1,53 @@
commit b87c312590877800b4e18a17a012b47839f5c06b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 23 13:44:58 2017 +1000
libXi 1.7.9
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 557b60798a9da49386f1034b133838332735de22
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Dec 27 17:24:10 2016 +0100
Fix possible free of uninitialized pointer
If the _XReply() call fails, we'll try to free an uninitialized
pointer.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=849026
Reported-by: Thomas Walker <thwalker3@gmail.com>
Signed-off-by: Emilio Pozuelo Monfort <pochu@debian.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Tested-by: Thomas Walker <thwalker3@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 4c5c8d6246debc06a56120cff71bfdf1877884d0
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Oct 25 21:31:19 2016 +0200
Check that allocating a buffer succeeded
Since we are going to write into the buffer, we should make sure the
allocation didn't fail.
Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Emilio Pozuelo Monfort <pochu@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7ac03c6c1907a39b5b42b17ad331295b8c85154d
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Oct 25 21:31:18 2016 +0200
Plug a memory leak
Introduced in commit 19a9cd6.
Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Emilio Pozuelo Monfort <pochu@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1bdeb431c3cc9eec7e12fdd29a83237f2f228865
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 25 12:43:44 2016 +1000

20
lib/libXi/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libXi 1.7.8.
# Generated by GNU Autoconf 2.69 for libXi 1.7.9.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@ -651,8 +651,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libXi'
PACKAGE_TARNAME='libXi'
PACKAGE_VERSION='1.7.8'
PACKAGE_STRING='libXi 1.7.8'
PACKAGE_VERSION='1.7.9'
PACKAGE_STRING='libXi 1.7.9'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@ -1451,7 +1451,7 @@ if test "$ac_init_help" = "long"; then
# 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 libXi 1.7.8 to adapt to many kinds of systems.
\`configure' configures libXi 1.7.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1521,7 +1521,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libXi 1.7.8:";;
short | recursive ) echo "Configuration of libXi 1.7.9:";;
esac
cat <<\_ACEOF
@ -1660,7 +1660,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libXi configure 1.7.8
libXi configure 1.7.9
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1984,7 +1984,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libXi $as_me 1.7.8, which was
It was created by libXi $as_me 1.7.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2813,7 +2813,7 @@ fi
# Define the identity of the package.
PACKAGE='libXi'
VERSION='1.7.8'
VERSION='1.7.9'
cat >>confdefs.h <<_ACEOF
@ -19175,7 +19175,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libXi $as_me 1.7.8, which was
This file was extended by libXi $as_me 1.7.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -19241,7 +19241,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libXi config.status 1.7.8
libXi config.status 1.7.9
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
lib/libXi/configure.ac
View File

@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([libXi], [1.7.8],
AC_INIT([libXi], [1.7.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h])

9
lib/libXi/src/XIQueryDevice.c
View File

@ -46,7 +46,7 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return)
char *ptr;
char *end;
int i;
char *buf;
char *buf = NULL;
XExtDisplayInfo *extinfo = XInput_find_display(dpy);
@ -66,17 +66,18 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return)
{
*ndevices_return = reply.num_devices;
info = Xmalloc((reply.num_devices + 1) * sizeof(XIDeviceInfo));
buf = Xmalloc(reply.length * 4);
}
else
{
*ndevices_return = 0;
info = NULL;
buf = NULL;
}
if (!info)
if (!info || !buf)
goto error;
buf = Xmalloc(reply.length * 4);
_XRead(dpy, buf, reply.length * 4);
ptr = buf;
end = buf + reply.length * 4;
@ -136,6 +137,8 @@ error_loop:
Xfree(info[i].classes);
}
error:
Xfree(info);
Xfree(buf);
UnlockDisplay(dpy);
error_unlocked:
SyncHandle();