[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/8] usb-bus: use snprintf
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 8/8] usb-bus: use snprintf |
Date: |
Mon, 24 Jan 2011 17:30:55 +0100 |
From: Blue Swirl <address@hidden>
Avoid this warning from OpenBSD linker:
LINK i386-softmmu/qemu
../usb-bus.o(.text+0x27c): In function `usb_get_fw_dev_path':
/src/qemu/hw/usb-bus.c:294: warning: sprintf() is often misused,
please use snprintf()
Signed-off-by: Blue Swirl <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-bus.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/usb-bus.c b/hw/usb-bus.c
index ac56fbc..abc7e61 100644
--- a/hw/usb-bus.c
+++ b/hw/usb-bus.c
@@ -298,20 +298,22 @@ static char *usb_get_fw_dev_path(DeviceState *qdev)
{
USBDevice *dev = DO_UPCAST(USBDevice, qdev, qdev);
char *fw_path, *in;
- int pos = 0;
+ ssize_t pos = 0, fw_len;
long nr;
- fw_path = qemu_malloc(32 + strlen(dev->port->path) * 6);
+ fw_len = 32 + strlen(dev->port->path) * 6;
+ fw_path = qemu_malloc(fw_len);
in = dev->port->path;
- while (true) {
+ while (fw_len - pos > 0) {
nr = strtol(in, &in, 10);
if (in[0] == '.') {
/* some hub between root port and device */
- pos += sprintf(fw_path + pos, "address@hidden/", nr);
+ pos += snprintf(fw_path + pos, fw_len - pos, "address@hidden/",
nr);
in++;
} else {
/* the device itself */
- pos += sprintf(fw_path + pos, "address@hidden",
qdev_fw_name(qdev), nr);
+ pos += snprintf(fw_path + pos, fw_len - pos, "address@hidden",
+ qdev_fw_name(qdev), nr);
break;
}
}
--
1.7.1
- [Qemu-devel] [PULL 0/8] usb patch queue, Gerd Hoffmann, 2011/01/24
- [Qemu-devel] [PATCH 3/8] usb hid: move head+n to common struct, Gerd Hoffmann, 2011/01/24
- [Qemu-devel] [PATCH 2/8] usb keyboard: add event event queue, Gerd Hoffmann, 2011/01/24
- [Qemu-devel] [PATCH 6/8] usb hub: add migration support, Gerd Hoffmann, 2011/01/24
- [Qemu-devel] [PATCH 7/8] usb hid: add migration support, Gerd Hoffmann, 2011/01/24
- [Qemu-devel] [PATCH 5/8] usb core: add migration support, Gerd Hoffmann, 2011/01/24
- [Qemu-devel] [PATCH 8/8] usb-bus: use snprintf,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 1/8] add event queueing to USB HID, Gerd Hoffmann, 2011/01/24