core: Ensure that reported event bits are initialized

Closes #774

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

diff --git a/libusb/io.c b/libusb/io.c
index 48e964d5802e762062142b146c0e05193f29715a..272177eef75ac24a42b6c9d3b566168369e29591 100644 (file)
--- a/libusb/io.c
+++ b/libusb/io.c
@@ -2229,6 +2229,8 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv)
        if (tv->tv_usec % 1000)
                timeout_ms++;
 
+       reported_events.event_bits = 0;
+
        usbi_start_event_handling(ctx);
 
        r = usbi_wait_for_events(ctx, &reported_events, timeout_ms);

diff --git a/libusb/libusbi.h b/libusb/libusbi.h
index b5b4a2a7a82685c0e037f343c9929289875c8b62..d0e57e4f4e8f735f6b14081031dcc0981f5aec19 100644 (file)
--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
@@ -686,10 +686,15 @@ static inline int usbi_using_timer(struct libusb_context *ctx)
 }
 
 struct usbi_reported_events {
-       unsigned int event_triggered:1;
+       union {
+               struct {
+                       unsigned int event_triggered:1;
 #ifdef HAVE_OS_TIMER
-       unsigned int timer_triggered:1;
+                       unsigned int timer_triggered:1;
 #endif
+               };
+               unsigned int event_bits;
+       };
        void *event_data;
        unsigned int event_data_count;
        unsigned int num_ready;

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index acdfcec6bb3934f18f863e8a9b8e63fbc87a9fc1..a0044a0fa4d5aa2912f9746d14f6f355dd6ad317 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11549
+#define LIBUSB_NANO 11550