session: fix use after free of session->devs as reported by valgrind

[libsigrok.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index d7c32567fb7971f62925d118151a8a8b0bab7064..0eb86f4dee75ad66b05f31ba78b32ffcc39d1cba 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <glib.h>
-#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -133,6 +133,25 @@ SR_API int sr_dev_channel_enable(struct sr_channel *channel,
        return SR_OK;
 }
 
+/* Returns the next enabled channel, wrapping around if necessary. */
+SR_PRIV struct sr_channel *sr_next_enabled_channel(const struct sr_dev_inst *sdi,
+               struct sr_channel *cur_channel)
+{
+       struct sr_channel *next_channel;
+       GSList *l;
+
+       next_channel = cur_channel;
+       do {
+               l = g_slist_find(sdi->channels, next_channel);
+               if (l && l->next)
+                       next_channel = l->next->data;
+               else
+                       next_channel = sdi->channels->data;
+       } while (!next_channel->enabled);
+
+       return next_channel;
+}
+
 /**
  * Determine whether the specified device instance has the specified
  * capability.
@@ -242,6 +261,9 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
        }
        g_slist_free(sdi->channel_groups);
 
+       if (sdi->session)
+               sr_session_dev_remove(sdi->session, sdi);
+
        g_free(sdi->vendor);
        g_free(sdi->model);
        g_free(sdi->version);
@@ -522,11 +544,10 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
 {
 #ifdef HAVE_LIBUSB_1_0
        struct drv_context *drvc;
-       int r, cnt, i, a, b;
+       int cnt, i, a, b;
        char connection_id[64];
        struct sr_usb_dev_inst *usb;
        struct libusb_device **devlist;
-       struct libusb_device_descriptor des;
 #endif
 
        if (!sdi)
@@ -547,7 +568,7 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
        if ((!sdi->connection_id) && (sdi->inst_type == SR_INST_USB)) {
                /* connection_id isn't populated, let's do that here. */
 
-               drvc = sdi->driver->priv;
+               drvc = sdi->driver->context;
                usb = sdi->conn;
 
                if ((cnt = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist)) < 0) {
@@ -557,12 +578,6 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
                }
 
                for (i = 0; i < cnt; i++) {
-                       if ((r = libusb_get_device_descriptor(devlist[i], &des)) < 0) {
-                               sr_err("Failed to get device descriptor: %s.",
-                                      libusb_error_name(r));
-                               continue;
-                       }
-
                        /* Find the USB device by the logical address we know. */
                        b = libusb_get_bus_number(devlist[i]);
                        a = libusb_get_device_address(devlist[i]);