summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToby Gray <toby.gray@realvnc.com>2013-06-26 16:26:39 +0100
committerHans de Goede <hdegoede@redhat.com>2013-06-26 17:29:36 +0200
commit004c7a7fabb1c1f1ded97c776291c4a645941d99 (patch)
tree1a3e829bc4c22c8331fddd28580a05dfeae0640c
parent83c9c3cb73bb9af710c6f8e068d0af8b7206df08 (diff)
downloadlibusb-004c7a7fabb1c1f1ded97c776291c4a645941d99.tar.gz
Core: Avoid passing uninitialised data down the hotplug pipe.
Due to alignment requirements, libusb_hotplug_message might have some padding bytes. This change makes sure that these padding bytes are initialised. Valgrind no longer complains about passing uninitialised data to the write system call. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--libusb/core.c2
-rw-r--r--libusb/version_nano.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/libusb/core.c b/libusb/core.c
index 900ac02..7fa3b63 100644
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -531,6 +531,7 @@ void usbi_connect_device(struct libusb_device *dev)
libusb_hotplug_message message;
ssize_t ret;
+ memset(&message, 0, sizeof(message));
message.event = LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED;
message.device = dev;
dev->attached = 1;
@@ -556,6 +557,7 @@ void usbi_disconnect_device(struct libusb_device *dev)
struct libusb_context *ctx = dev->ctx;
ssize_t ret;
+ memset(&message, 0, sizeof(message));
message.event = LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT;
message.device = dev;
usbi_mutex_lock(&dev->lock);
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 59c6ba3..a43bb74 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10761
+#define LIBUSB_NANO 10762