Fix a USB timeout related issue in sr_session_iteration().

This issue could lead to e.g. crashes when an OLS was used.

This fixes bug #571.

diff --git a/src/session.c b/src/session.c
index 0780a27ab3d2476e80df9e5af32ad184eb3bd9b4..a3f6a86d3ef8226659f67f5fc222ed44726bf14c 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -385,17 +385,20 @@ static int sr_session_iteration(struct sr_session *session, gboolean block)
        struct timeval tv;
 #endif
 
-       timeout = block ? 0 : session->source_timeout;
+       timeout = block ? session->source_timeout : 0;
 
 #ifdef HAVE_LIBUSB_1_0
-       ret = libusb_get_next_timeout(session->ctx->libusb_ctx, &tv);
-       if (ret < 0) {
-               sr_err("Error getting libusb timeout: %s",
-                       libusb_error_name(ret));
-               return SR_ERR;
-       } else if (ret == 1) {
-               usb_timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000;
-               timeout = MIN(timeout, usb_timeout);
+       if (session->ctx->usb_source_present) {
+               timeout = block ? 0 : session->source_timeout;
+               ret = libusb_get_next_timeout(session->ctx->libusb_ctx, &tv);
+               if (ret < 0) {
+                       sr_err("Error getting libusb timeout: %s",
+                               libusb_error_name(ret));
+                       return SR_ERR;
+               } else if (ret == 1) {
+                       usb_timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000;
+                       timeout = MIN(timeout, usb_timeout);
+               }
        }
 #endif