From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58761 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PgvdA-0003lQ-8i for qemu-devel@nongnu.org; Sun, 23 Jan 2011 03:49:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pgvd9-0005SF-3Z for qemu-devel@nongnu.org; Sun, 23 Jan 2011 03:49:04 -0500 Received: from mail-pz0-f45.google.com ([209.85.210.45]:61359) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pgvd8-0005RH-UG for qemu-devel@nongnu.org; Sun, 23 Jan 2011 03:49:03 -0500 Received: by pzk2 with SMTP id 2so622023pzk.4 for ; Sun, 23 Jan 2011 00:49:01 -0800 (PST) MIME-Version: 1.0 From: Blue Swirl Date: Sun, 23 Jan 2011 08:48:41 +0000 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: [Qemu-devel] [PATCH] usb-bus: use snprintf List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann , qemu-devel 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 --- 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 6e2e5fd..7aba9bb 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -282,20 +282,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, "hub@%ld/", nr); + pos += snprintf(fw_path + pos, fw_len - pos, "hub@%ld/", nr); in++; } else { /* the device itself */ - pos += sprintf(fw_path + pos, "%s@%ld", qdev_fw_name(qdev), nr); + pos += snprintf(fw_path + pos, fw_len - pos, "%s@%ld", + qdev_fw_name(qdev), nr); break; } } -- 1.6.2.4