sr_scpi_free(): Allow NULL as argument.

[libsigrok.git] / bindings / cxx / classes.cpp

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index cfc2dafbfa4b10d32cf5d6ac9ace9f395b0f4121..5e07c2c6f8744ad32ea0e388497bb851e2b536f2 100644 (file)
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -509,10 +509,11 @@ set<const ConfigKey *> Configurable::config_keys() const
 
        opts = sr_dev_options(config_driver, config_sdi, config_channel_group);
 
-       for (guint i = 0; i < opts->len; i++)
-               result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));
-
-       g_array_free(opts, TRUE);
+       if (opts) {
+               for (guint i = 0; i < opts->len; i++)
+                       result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));
+               g_array_free(opts, TRUE);
+       }
 
        return result;
 }
@@ -1328,6 +1329,11 @@ void Input::end()
        check(sr_input_end(_structure));
 }
 
+void Input::reset()
+{
+       check(sr_input_reset(_structure));
+}
+
 Input::~Input()
 {
        sr_input_free(_structure);