sigrok-cli: Fix leaks in device_scan().

[sigrok-cli.git] / sigrok-cli.c

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 0a5a795878c63b0a0bf8cf4e6c25f5635d57f3b8..dbe0b2cdecd3c2d297c0b7686ddece50dbd23bd4 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -46,6 +46,7 @@ static struct sr_output_format *output_format = NULL;
 static int default_output_format = FALSE;
 static char *output_format_param = NULL;
 #ifdef HAVE_SRD
+static struct srd_session *srd_sess = NULL;
 static GHashTable *pd_ann_visible = NULL;
 #endif
 static GByteArray *savebuf;
@@ -177,11 +178,14 @@ static GSList *device_scan(void)
                }
                if (!driver) {
                        g_critical("Driver %s not found.", drvname);
+                       g_hash_table_destroy(drvargs);
+                       g_free(drvname);
                        return NULL;
                }
                g_free(drvname);
                if (sr_driver_init(sr_ctx, driver) != SR_OK) {
                        g_critical("Failed to initialize driver.");
+                       g_hash_table_destroy(drvargs);
                        return NULL;
                }
                drvopts = NULL;
@@ -192,7 +196,7 @@ static GSList *device_scan(void)
                                return NULL;
                        }
                }
-               g_hash_table_destroy(drvargs); 
+               g_hash_table_destroy(drvargs);
                devices = sr_driver_scan(driver, drvopts);
                g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
        } else {
@@ -700,7 +704,7 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
        GSList *l;
        GString *out;
        int sample_size, ret;
-       uint64_t samplerate, output_len, filter_out_len;
+       uint64_t samplerate, output_len, filter_out_len, end_sample;
        uint8_t *output_buf, *filter_out;
 
        (void) cb_data;
@@ -753,14 +757,19 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                GVariant *gvar;
                if (opt_pds && logic_probelist->len) {
                        if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-                                       &gvar, sdi) != SR_OK) {
-                               g_critical("Unable to initialize protocol "
-                                               "decoders: no samplerate found.");
+                                       &gvar, sdi) == SR_OK) {
+                               samplerate = g_variant_get_uint64(gvar);
+                               g_variant_unref(gvar);
+                               if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE,
+                                               g_variant_new_uint64(samplerate)) != SRD_OK) {
+                                       g_critical("Failed to configure decode session.");
+                                       break;
+                               }
+                       }
+                       if (srd_session_start(srd_sess) != SRD_OK) {
+                               g_critical("Failed to start decode session.");
                                break;
                        }
-                       samplerate = g_variant_get_uint64(gvar);
-                       g_variant_unref(gvar);
-                       srd_session_start(logic_probelist->len, unitsize, samplerate);
                }
 #endif
                break;
@@ -774,6 +783,14 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                        case SR_CONF_SAMPLERATE:
                                samplerate = g_variant_get_uint64(src->data);
                                g_debug("cli: got samplerate %"PRIu64" Hz", samplerate);
+#ifdef HAVE_SRD
+                               if (opt_pds) {
+                                       if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE,
+                                                       g_variant_new_uint64(samplerate)) != SRD_OK) {
+                                               g_critical("Failed to pass samplerate to decoder.");
+                                       }
+                               }
+#endif
                                break;
                        case SR_CONF_SAMPLE_INTERVAL:
                                samplerate = g_variant_get_uint64(src->data);
@@ -814,9 +831,10 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                if (ret != SR_OK)
                        break;
 
-               /* What comes out of the filter is guaranteed to be packed into the
+               /*
+                * What comes out of the filter is guaranteed to be packed into the
                 * minimum size needed to support the number of samples at this sample
-                * size. however, the driver may have submitted too much -- cut off
+                * size. however, the driver may have submitted too much. Cut off
                 * the buffer of the last packet according to the sample limit.
                 */
                if (limit_samples && (received_samples + logic->length / sample_size >
@@ -829,8 +847,9 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                } else {
                        if (opt_pds) {
 #ifdef HAVE_SRD
-                               if (srd_session_send(received_samples, (uint8_t*)filter_out,
-                                               filter_out_len) != SRD_OK)
+                               end_sample = received_samples + filter_out_len / unitsize;
+                               if (srd_session_send(srd_sess, received_samples, end_sample,
+                                               (uint8_t*)filter_out, filter_out_len) != SRD_OK)
                                        sr_session_stop();
 #endif
                        } else {
@@ -1091,7 +1110,7 @@ static int register_pds(struct sr_dev *dev, const char *pdstring)
                        break;
                }
 
-               if (!(di = srd_inst_new(pd_name, options))) {
+               if (!(di = srd_inst_new(srd_sess, pd_name, options))) {
                        g_critical("Failed to instantiate protocol decoder %s.", pd_name);
                        ret = 1;
                        break;
@@ -1147,7 +1166,7 @@ int setup_pd_stack(void)
 
                /* First PD goes at the bottom of the stack. */
                ids = g_strsplit(pds[0], ":", 0);
-               if (!(di_from = srd_inst_find_by_id(ids[0]))) {
+               if (!(di_from = srd_inst_find_by_id(srd_sess, ids[0]))) {
                        g_strfreev(ids);
                        g_critical("Cannot stack protocol decoder '%s': "
                                        "instance not found.", pds[0]);
@@ -1158,14 +1177,14 @@ int setup_pd_stack(void)
                /* Every subsequent PD goes on top. */
                for (i = 1; pds[i]; i++) {
                        ids = g_strsplit(pds[i], ":", 0);
-                       if (!(di_to = srd_inst_find_by_id(ids[0]))) {
+                       if (!(di_to = srd_inst_find_by_id(srd_sess, ids[0]))) {
                                g_strfreev(ids);
                                g_critical("Cannot stack protocol decoder '%s': "
                                                "instance not found.", pds[i]);
                                return 1;
                        }
                        g_strfreev(ids);
-                       if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
+                       if ((ret = srd_inst_stack(srd_sess, di_from, di_to)) != SRD_OK)
                                return 1;
 
                        /* Don't show annotation from this PD. Only the last PD in
@@ -1770,6 +1789,10 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level,
                fprintf(stderr, "%s\n", message);
                fflush(stderr);
        }
+
+       if (log_level & (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL))
+               exit(1);
+
 }
 
 int main(int argc, char **argv)
@@ -1806,9 +1829,13 @@ int main(int argc, char **argv)
        if (opt_pds) {
                if (srd_init(NULL) != SRD_OK)
                        goto done;
+               if (srd_session_new(&srd_sess) != SRD_OK) {
+                       g_critical("Failed to create new decode session.");
+                       goto done;
+               }
                if (register_pds(NULL, opt_pds) != 0)
                        goto done;
-               if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
+               if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_ANN,
                                show_pd_annotations, NULL) != SRD_OK)
                        goto done;
                if (setup_pd_stack() != 0)