From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTqpC-00043j-EF for qemu-devel@nongnu.org; Mon, 03 Dec 2018 11:12:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTqp9-00061D-9n for qemu-devel@nongnu.org; Mon, 03 Dec 2018 11:11:58 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37319) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gTqp9-00060a-12 for qemu-devel@nongnu.org; Mon, 03 Dec 2018 11:11:55 -0500 Received: by mail-wr1-f66.google.com with SMTP id j10so12776253wru.4 for ; Mon, 03 Dec 2018 08:11:54 -0800 (PST) References: <20181203101045.27976-1-kraxel@redhat.com> <20181203101045.27976-2-kraxel@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <442f3c99-0dd8-f866-5587-b475cf1072eb@redhat.com> Date: Mon, 3 Dec 2018 17:11:48 +0100 MIME-Version: 1.0 In-Reply-To: <20181203101045.27976-2-kraxel@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH for-3.1 v3 1/2] usb-mtp: fix utf16_to_str List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann , qemu-devel@nongnu.org Cc: public@hansmi.ch On 3/12/18 11:10, Gerd Hoffmann wrote: > Make utf16_to_str return an allocated string. Remove the assumtion that > the number of string bytes equals the number of utf16 chars (which is > only true for ascii chars). Instead call wcstombs twice, once to figure > the storage size and once for the actual conversion (as suggested by the > wcstombs manpage). > > Reported-by: Michael Hanselmann > Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daudé > --- > hw/usb/dev-mtp.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c > index 00a3691bae..0f6a9702ef 100644 > --- a/hw/usb/dev-mtp.c > +++ b/hw/usb/dev-mtp.c > @@ -1593,17 +1593,23 @@ static void usb_mtp_cancel_packet(USBDevice *dev, USBPacket *p) > fprintf(stderr, "%s\n", __func__); > } > > -static void utf16_to_str(uint8_t len, uint16_t *arr, char *name) > +static char *utf16_to_str(uint8_t len, uint16_t *arr) > { > - int count; > - wchar_t *wstr = g_new0(wchar_t, len); > + wchar_t *wstr = g_new0(wchar_t, len + 1); > + int count, dlen; > + char *dest; > > for (count = 0; count < len; count++) { > + /* FIXME: not working for surrogate pairs */ > wstr[count] = (wchar_t)arr[count]; > } > + wstr[count] = 0; > > - wcstombs(name, wstr, len); > + dlen = wcstombs(NULL, wstr, 0) + 1; > + dest = g_malloc(dlen); > + wcstombs(dest, wstr, dlen); > g_free(wstr); > + return dest; > } > > /* Wrapper around write, returns 0 on failure */ > @@ -1703,7 +1709,7 @@ static void usb_mtp_write_metadata(MTPState *s) > { > MTPData *d = s->data_out; > ObjectInfo *dataset = (ObjectInfo *)d->data; > - char *filename = g_new0(char, dataset->length); > + char *filename; > MTPObject *o; > MTPObject *p = usb_mtp_object_lookup(s, s->dataset.parent_handle); > uint32_t next_handle = s->next_handle; > @@ -1711,7 +1717,7 @@ static void usb_mtp_write_metadata(MTPState *s) > assert(!s->write_pending); > assert(p != NULL); > > - utf16_to_str(dataset->length, dataset->filename, filename); > + filename = utf16_to_str(dataset->length, dataset->filename); > > o = usb_mtp_object_lookup_name(p, filename, dataset->length); > if (o != NULL) { >