decode: fix memory leaks in annotation setup error paths

[sigrok-cli.git] / decode.c

diff --git a/decode.c b/decode.c
index 2b95f2346fb2d22d3fd8b5bf4199aa980ba0bd88..bf6fc2fc772985425d5779437bcfd1d941aa433b 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -38,6 +38,7 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
        GSList *optl;
        GVariant *gvar;
        gint64 val_int;
+       double val_dbl;
        int ret;
        char *val_str, *conv;
 
@@ -53,14 +54,25 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
                if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_STRING)) {
                        gvar = g_variant_new_string(val_str);
                } else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_INT64)) {
+                       conv = NULL;
                        val_int = strtoll(val_str, &conv, 0);
-                       if (!conv || conv == val_str) {
+                       if (!conv || conv == val_str || *conv) {
                                g_critical("Protocol decoder '%s' option '%s' "
                                                "requires a number.", dec->name, o->id);
                                ret = FALSE;
                                break;
                        }
                        gvar = g_variant_new_int64(val_int);
+               } else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_DOUBLE)) {
+                       conv = NULL;
+                       val_dbl = strtod(val_str, &conv);
+                       if (!conv || conv == val_str || *conv) {
+                               g_critical("Protocol decoder '%s' option '%s' requires a float number.",
+                                       dec->name, o->id);
+                               ret = FALSE;
+                               break;
+                       }
+                       gvar = g_variant_new_double(val_dbl);
                } else {
                        g_critical("Unsupported type for option '%s' (%s)",
                                        o->id, g_variant_get_type_string(o->def));
@@ -305,10 +317,14 @@ int setup_pd_annotations(char *opt_pd_annotations)
                keyval = g_strsplit(*pdtok, "=", 0);
                if (!(dec = srd_decoder_get_by_id(keyval[0]))) {
                        g_critical("Protocol decoder '%s' not found.", keyval[0]);
+                       g_strfreev(keyval);
+                       g_strfreev(pds);
                        return 1;
                }
                if (!dec->annotations) {
                        g_critical("Protocol decoder '%s' has no annotations.", keyval[0]);
+                       g_strfreev(keyval);
+                       g_strfreev(pds);
                        return 1;
                }
                if (g_strv_length(keyval) == 2 && keyval[1][0] != '\0') {
@@ -324,6 +340,8 @@ int setup_pd_annotations(char *opt_pd_annotations)
                                if (!l) {
                                        g_critical("Annotation '%s' not found "
                                                        "for protocol decoder '%s'.", *ann, keyval[0]);
+                                       g_strfreev(keyval);
+                                       g_strfreev(pds);
                                        return 1;
                                }
                                l_ann = g_hash_table_lookup(pd_ann_visible, keyval[0]);