[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/10] usb: mtp: avoid empty description string
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 07/10] usb: mtp: avoid empty description string |
Date: |
Mon, 5 May 2014 13:12:36 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Peter Wu <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
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 45f9562..a30a886 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -1046,7 +1046,7 @@ static int usb_mtp_initfn(USBDevice *dev)
QTAILQ_INIT(&s->objects);
if (s->desc == NULL) {
s->desc = strrchr(s->root, '/');
- if (s->desc) {
+ if (s->desc && s->desc[0]) {
s->desc = g_strdup(s->desc + 1);
} else {
s->desc = g_strdup("none");
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] usb patch queue, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 02/10] usb: mtp: replace debug printfs with trace points, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 06/10] usb: mtp: fix error path memory leak, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 01/10] usb-ohci: Add vmstate descriptor, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 03/10] usb: mtp: fix usb_mtp_add_u64, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 07/10] usb: mtp: avoid empty description string,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 09/10] usb: mtp: fix possible buffer overflow, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 08/10] usb: mtp: drop data-out hexdump, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 04/10] usb: mtp: fix version (is decimal not bcd), Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 10/10] usb: mtp: reply INCOMPLETE_TRANSFER on read errors, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 05/10] usb: mtp: fix serial (must be exact 32 chars), Gerd Hoffmann, 2014/05/05
- Re: [Qemu-devel] [PULL 00/10] usb patch queue, Peter Maydell, 2014/05/07