Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 869f076b authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Mauro Carvalho Chehab
Browse files

[media] ati_remote: avoid fragile snprintf use 



Passing overlapping source and destination to snprintf is
fragile. Replace with a single (mostly) equivalent call. If one wants
to preserve the space preceding udev->product whether or not there was
a manufacturer, just remove udev->manufacturer from the && expression.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent e57b36c0

drivers/media/rc/ati_remote.c

+4 −7
Original line number Diff line number Diff line
@@ -873,13 +873,10 @@ static int ati_remote_probe(struct usb_interface *interface, 
	strlcat(ati_remote->rc_phys, "/input0", sizeof(ati_remote->rc_phys));

	strlcat(ati_remote->mouse_phys, "/input1", sizeof(ati_remote->mouse_phys));



	if (udev->manufacturer)

		strlcpy(ati_remote->rc_name, udev->manufacturer,

			sizeof(ati_remote->rc_name));



	if (udev->product)

		snprintf(ati_remote->rc_name, sizeof(ati_remote->rc_name),

			 "%s %s", ati_remote->rc_name, udev->product);

	snprintf(ati_remote->rc_name, sizeof(ati_remote->rc_name), "%s%s%s",

		udev->manufacturer ?: "",

		udev->manufacturer && udev->product ? " " : "",

		udev->product ?: "");



	if (!strlen(ati_remote->rc_name))

		snprintf(ati_remote->rc_name, sizeof(ati_remote->rc_name),