[haiku-commits] r39908 - haiku/trunk/src/add-ons/kernel/drivers/bus/usb
- From: mmlr@xxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 21 Dec 2010 01:42:21 +0100 (CET)
Author: mmlr
Date: 2010-12-21 01:42:21 +0100 (Tue, 21 Dec 2010)
New Revision: 39908
Changeset: http://dev.haiku-os.org/changeset/39908
Modified:
haiku/trunk/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp
Log:
* Enlarge the device name buffer a bit as with a deep enough hierarchy we might
actually hit this limit.
* Use snprintf() instead of sprintf() as suggested by CID 6447 (even though the
USB module isn't supposed to return such a malformed string).
Modified: haiku/trunk/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp 2010-12-21
00:36:23 UTC (rev 39907)
+++ haiku/trunk/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp 2010-12-21
00:42:21 UTC (rev 39908)
@@ -31,7 +31,7 @@
mutex lock;
uint32 reference_count;
- char name[32];
+ char name[64];
void *link;
sem_id notify;
@@ -61,12 +61,13 @@
return B_NO_MORE_SEMS;
}
- char deviceName[32];
+ char deviceName[64];
memcpy(deviceName, &newDevice, sizeof(usb_device));
if (gUSBModule->usb_ioctl('DNAM', deviceName, sizeof(deviceName)) >=
B_OK) {
- sprintf(device->name, "bus/usb/%s", deviceName);
+ snprintf(device->name, sizeof(device->name), "bus/usb/%s",
deviceName);
} else {
- sprintf(device->name, "bus/usb/%08lx", newDevice);
+ snprintf(device->name, sizeof(device->name), "bus/usb/%08lx",
+ newDevice);
}
device->device = newDevice;
Other related posts:
- » [haiku-commits] r39908 - haiku/trunk/src/add-ons/kernel/drivers/bus/usb - mmlr
