Received: from eggs.gnu.org ([209.51.188.92]:44155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG3nb-0000vH-S9 for qemu-devel@nongnu.org; Mon, 15 Apr 2019 11:45:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hG3na-0007yF-DH for qemu-devel@nongnu.org; Mon, 15 Apr 2019 11:45:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34980) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hG3nZ-0007Zw-T3 for qemu-devel@nongnu.org; Mon, 15 Apr 2019 11:45:34 -0400 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 15 Apr 2019 16:45:01 +0100 Message-Id: <20190415154503.6758-2-berrange@redhat.com> In-Reply-To: <20190415154503.6758-1-berrange@redhat.com> References: <20190415154503.6758-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/3] usb-mtp: fix string length for filename when writing metadata List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Bandan Das , Thomas Huth , Greg Kurz , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= The ObjectInfo 'length' field provides the length of the wide character string filename. This is then converted to a multi-byte character string. This may have a different byte count to the wide character string. We should use the C string length of the multi-byte string instead. Signed-off-by: Daniel P. Berrang=C3=A9 --- hw/usb/dev-mtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index ebf210fbf8..838cd74da6 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1714,7 +1714,7 @@ static void usb_mtp_write_metadata(MTPState *s, uin= t64_t dlen) return; } =20 - o =3D usb_mtp_object_lookup_name(p, filename, dataset->length); + o =3D usb_mtp_object_lookup_name(p, filename, -1); if (o !=3D NULL) { next_handle =3D o->handle; } --=20 2.20.1