Windows: UsbDk: Fix potential buffer overflow

Closes #397

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/libusb/os/windows_usbdk.c b/libusb/os/windows_usbdk.c
index 135500018ccaf498da3eafd6c2a4e74e98380df7..fbccbd5cffcb7e9af9ba84d799a424f0fbe003ef 100644 (file)
--- a/libusb/os/windows_usbdk.c
+++ b/libusb/os/windows_usbdk.c
@@ -204,9 +204,9 @@ static void usbdk_exit(struct libusb_context *ctx)
 static int usbdk_get_session_id_for_device(struct libusb_context *ctx,
        PUSB_DK_DEVICE_ID id, unsigned long *session_id)
 {
-       char dev_identity[ARRAYSIZE(id->DeviceID) + ARRAYSIZE(id->InstanceID)];
+       char dev_identity[ARRAYSIZE(id->DeviceID) + ARRAYSIZE(id->InstanceID) + 1];
 
-       if (sprintf(dev_identity, "%S%S", id->DeviceID, id->InstanceID) == -1) {
+       if (snprintf(dev_identity, sizeof(dev_identity), "%S%S", id->DeviceID, id->InstanceID) == -1) {
                usbi_warn(ctx, "cannot form device identity", id->DeviceID);
                return LIBUSB_ERROR_NOT_SUPPORTED;
        }

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 5b295ba2ff830799c919648b2595cd22bab46a82..1adf6357ff420dffd6446a7acf3e90ad24ead79a 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11304
+#define LIBUSB_NANO 11305