From: Martin Kletzander Date: Fri, 31 May 2013 16:36:11 +0000 (+0200) Subject: usb: don't spoil decimal addresses X-Git-Tag: v1.0.5.3~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffe68a85c92a9a76cd85a7fbc1b0f691a19e47fe;p=thirdparty%2Flibvirt.git usb: don't spoil decimal addresses For USB devices, dev->name gets formated as %.3o:%.3o even though the numbers are decimal. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=967712 (cherry picked from commit dc0c7915697a902d6edc5820f5930653b7684c3c) --- diff --git a/src/util/virusb.c b/src/util/virusb.c index 6e43f8efd5..f9be5b63c0 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -340,10 +340,10 @@ virUSBDeviceNew(unsigned int bus, dev->bus = bus; dev->dev = devno; - if (snprintf(dev->name, sizeof(dev->name), "%.3o:%.3o", + if (snprintf(dev->name, sizeof(dev->name), "%.3d:%.3d", dev->bus, dev->dev) >= sizeof(dev->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("dev->name buffer overflow: %.3o:%.3o"), + _("dev->name buffer overflow: %.3d:%.3d"), dev->bus, dev->dev); virUSBDeviceFree(dev); return NULL;