usb: fix unbound stack usage for usb_mtp_add_str

Use heap instead of stack.

Signed-off-by: Peter Xu <[email protected]>
Signed-off-by: Gerd Hoffmann <[email protected]>

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 7391783193a0e8c0f04b82b9ff9800b2fa8da715..62fb7cd51810601355960ee099a187066cad831d 100644 (file)
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -718,7 +718,7 @@ static void usb_mtp_add_wstr(MTPData *data, const wchar_t *str)
 static void usb_mtp_add_str(MTPData *data, const char *str)
 {
     uint32_t len = strlen(str)+1;
 static void usb_mtp_add_str(MTPData *data, const char *str)
 {
     uint32_t len = strlen(str)+1;

-    wchar_t wstr[len];
+    wchar_t *wstr = g_new(wchar_t, len);

     size_t ret;
 
     ret = mbstowcs(wstr, str, len);
     size_t ret;
 
     ret = mbstowcs(wstr, str, len);


@@ -727,6 +727,8 @@ static void usb_mtp_add_str(MTPData *data, const char *str)
     } else {
         usb_mtp_add_wstr(data, wstr);
     }
     } else {
         usb_mtp_add_wstr(data, wstr);
     }

+
+    g_free(wstr);

 }
 
 static void usb_mtp_add_time(MTPData *data, time_t time)
 }
 
 static void usb_mtp_add_time(MTPData *data, time_t time)