[Git][xorg-team/lib/libinput][debian-unstable] 7 commits: Fix the termination of the readlink result

[Timo Aaltonen <tjaalton@debian.org>]

Title: GitLab

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 <peter.hutterer@who-t.net>
  (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 <peter.hutterer@who-t.net>
  (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 <peter.hutterer@who-t.net>
  (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 <peter.hutterer@who-t.net>
  

• 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		-libinput (1.16.3-2) UNRELEASED; urgency=medium
	1	+libinput (1.16.4-1) unstable; urgency=medium
2	2
3	3	* control, rules: Enable building debug-gui and tests, add check and
4	4	libgtk-3-dev to build-depends. (Closes: #975528)
	5	+ * New upstream release.
5	6
6		- -- Timo Aaltonen <tjaalton@debian.org> Mon, 23 Nov 2020 13:26:30 +0200
	7	+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 27 Nov 2020 15:16:54 +0200
7	8
8	9	libinput (1.16.3-1) unstable; urgency=medium
9	10

meson.build

---

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

src/builddir.h

---

...	...	@@ -35,7 +35,7 @@
35	35	static inline char *
36	36	builddir_lookup(void)
37	37	{
38		- char execdir[PATH_MAX] = {0};
	38	+ char execdir[PATH_MAX];
39	39	char *pathsep;
40	40	ssize_t nread;
41	41
...	...	@@ -50,7 +50,7 @@ builddir_lookup(void)
50	50
51	51	/* readlink doesn't terminate the string and readlink says
52	52	anything past sz is undefined */
53		- execdir[++nread] = '\0';
	53	+ execdir[nread] = '\0';
54	54
55	55	pathsep = strrchr(execdir, '/');
56	56	if (!pathsep)

src/evdev-mt-touchpad-thumb.c

---

...	...	@@ -358,8 +358,9 @@ tp_thumb_update_multifinger(struct tp_dispatch *tp)
358	358	* the behavior of the other touches.)
359	359	*/
360	360
361		- if ((newest->initial_time - oldest->initial_time) < THUMB_TIMEOUT &&
362		- first->point.y < tp->thumb.lower_thumb_line) {
	361	+ if (newest &&
	362	+ (newest->initial_time - oldest->initial_time) < THUMB_TIMEOUT &&
	363	+ first->point.y < tp->thumb.lower_thumb_line) {
363	364	tp_thumb_lift(tp);
364	365	return;
365	366	}

test/litest-selftest.c

---

...	...	@@ -350,7 +350,7 @@ END_TEST
350	350
351	351	START_TEST(zalloc_overflow)
352	352	{
353		- zalloc(-1);
	353	+ zalloc((size_t)-1);
354	354	}
355	355	END_TEST
356	356

udev/80-libinput-device-groups.rules.in

---

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

udev/90-libinput-fuzz-override.rules.in

---

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

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.