libxi: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/XGetFCtl.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit b6553cdb36c1bd7071d3bf0493216c5483325716
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 3 10:28:10 2013 +1000
libXi 1.7.2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 18d895b..a66fcee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXi], [1.7.1.901],
+AC_INIT([libXi], [1.7.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h])
commit d804af99e2dfaf20b99822066a37d586f12c8a5f
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Thu Jun 27 17:16:38 2013 +0200
Remove check that can never be true.
clang warns:
warning: comparison of constant 268435455 with expression of type
'CARD16' (aka 'unsigned short') is always false
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c
index bb50bf3..2d71fab 100644
--- a/src/XGetFCtl.c
+++ b/src/XGetFCtl.c
@@ -125,9 +125,6 @@ XGetFeedbackControl(
case StringFeedbackClass:
{
xStringFeedbackState *strf = (xStringFeedbackState *) f;
-
- if (strf->num_syms_supported >= (INT_MAX / sizeof(KeySym)))
- goto out;
size += sizeof(XStringFeedbackState) +
(strf->num_syms_supported * sizeof(KeySym));
}
Reply to: