Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / 
libinput


Commits:
dc1edd14 by Peter Hutterer at 2020-11-16T13:43:26+10:00
Fix the termination of the readlink result

nread is the number of bytes put into the buffer, let's terminate it there
instead of one byte over. This only worked because execdir was initialized to
zero.

Signed-off-by: Peter Hutterer <[email protected]>
(cherry picked from commit 34fe17f72353b5fe65724390e4ec384ec848499a)

- - - - -
602820f8 by Peter Hutterer at 2020-11-16T13:44:05+10:00
Fix a few coverity complaints

All minor:
- execdir does not need initialization, it's not used until written to
- 'newest' could be NULL
- zalloc(-1) confuses coverity
- 't' is never used in that test

Signed-off-by: Peter Hutterer <[email protected]>
(cherry picked from commit cfd8e6c76c9be6c4ebdbc4e822762be4a30142e6)

- - - - -
d625520b by Peter Hutterer at 2020-11-27T08:12:32+10:00
udev: update rules to handle bind/unbind events

Summary: we expect add, change or remove but kernel 4.12 added bind and
unbind. These events were previously discarded by udevd. Our rules should
handle any event *but* remove, so update as suggested in the announce email
linked below.

For a longer explanation, see the system 247rc2 announcement
https://lists.freedesktop.org/archives/systemd-devel/2020-November/045570.html

Signed-off-by: Peter Hutterer <[email protected]>
(cherry picked from commit cd37dcfa66d59ecbdf787ee1aa34bb65f2a38b6d)

- - - - -
edddb5c0 by Peter Hutterer at 2020-11-27T10:36:26+10:00
libinput 1.16.4

Signed-off-by: Peter Hutterer <[email protected]>

- - - - -
32254f44 by Timo Aaltonen at 2020-11-27T15:12:04+02:00
Merge branch 'upstream-unstable' into debian-unstable

- - - - -
1ede72fb by Timo Aaltonen at 2020-11-27T15:13:04+02:00
bump the version

- - - - -
c2654b3b by Timo Aaltonen at 2020-11-27T15:17:03+02:00
release to sid

- - - - -


7 changed files:

- debian/changelog
- meson.build
- src/builddir.h
- src/evdev-mt-touchpad-thumb.c
- test/litest-selftest.c
- udev/80-libinput-device-groups.rules.in
- udev/90-libinput-fuzz-override.rules.in


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,10 @@
-libinput (1.16.3-2) UNRELEASED; urgency=medium
+libinput (1.16.4-1) unstable; urgency=medium
 
   * control, rules: Enable building debug-gui and tests, add check and
     libgtk-3-dev to build-depends. (Closes: #975528)
+  * New upstream release.
 
- -- Timo Aaltonen <[email protected]>  Mon, 23 Nov 2020 13:26:30 +0200
+ -- Timo Aaltonen <[email protected]>  Fri, 27 Nov 2020 15:16:54 +0200
 
 libinput (1.16.3-1) unstable; urgency=medium
 


=====================================
meson.build
=====================================
@@ -1,5 +1,5 @@
 project('libinput', 'c',
-       version : '1.16.3',
+       version : '1.16.4',
        license : 'MIT/Expat',
        default_options : [ 'c_std=gnu99', 'warning_level=2' ],
        meson_version : '>= 0.45.0')


=====================================
src/builddir.h
=====================================
@@ -35,7 +35,7 @@
 static inline char *
 builddir_lookup(void)
 {
-       char execdir[PATH_MAX] = {0};
+       char execdir[PATH_MAX];
        char *pathsep;
        ssize_t nread;
 
@@ -50,7 +50,7 @@ builddir_lookup(void)
 
        /* readlink doesn't terminate the string and readlink says
           anything past sz is undefined */
-       execdir[++nread] = '\0';
+       execdir[nread] = '\0';
 
        pathsep = strrchr(execdir, '/');
        if (!pathsep)


=====================================
src/evdev-mt-touchpad-thumb.c
=====================================
@@ -358,8 +358,9 @@ tp_thumb_update_multifinger(struct tp_dispatch *tp)
         * the behavior of the other touches.)
         */
 
-       if ((newest->initial_time - oldest->initial_time) < THUMB_TIMEOUT &&
-         first->point.y < tp->thumb.lower_thumb_line) {
+       if (newest &&
+           (newest->initial_time - oldest->initial_time) < THUMB_TIMEOUT &&
+           first->point.y < tp->thumb.lower_thumb_line) {
                tp_thumb_lift(tp);
                return;
        }


=====================================
test/litest-selftest.c
=====================================
@@ -350,7 +350,7 @@ END_TEST
 
 START_TEST(zalloc_overflow)
 {
-       zalloc(-1);
+       zalloc((size_t)-1);
 }
 END_TEST
 


=====================================
udev/80-libinput-device-groups.rules.in
=====================================
@@ -1,4 +1,4 @@
-ACTION!="add|change", GOTO="libinput_device_group_end"
+ACTION=="remove", GOTO="libinput_device_group_end"
 KERNEL!="event[0-9]*", GOTO="libinput_device_group_end"
 
 ATTRS{phys}=="?*", IMPORT{program}="@UDEV_TEST_PATH@libinput-device-group %S%p"


=====================================
udev/90-libinput-fuzz-override.rules.in
=====================================
@@ -3,7 +3,7 @@
 # This file contains lookup rules for libinput model-specific quirks.
 # IT IS NOT A STABLE API AND SUBJECT TO CHANGE AT ANY TIME
 
-ACTION!="add|change", GOTO="libinput_fuzz_override_end"
+ACTION=="remove", GOTO="libinput_fuzz_override_end"
 KERNEL!="event*", GOTO="libinput_fuzz_override_end"
 
 # Two-step process: fuzz-extract sets the LIBINPUT_FUZZ property and



View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/libinput/-/compare/3143116e09466f808c0c4fab0b8429df72b4dce0...c2654b3b30b15c0d6d1367535d1b5e8d4c919bce

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/libinput/-/compare/3143116e09466f808c0c4fab0b8429df72b4dce0...c2654b3b30b15c0d6d1367535d1b5e8d4c919bce
You're receiving this email because of your account on salsa.debian.org.


Reply via email to