X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=cfc2dafbfa4b10d32cf5d6ac9ace9f395b0f4121;hb=116670b15d1facd756cb97525b3fea51d11d28a4;hp=f7b1dcba112c7dbcc583d11c17d7775e55d513c1;hpb=d9d57ceb283dc43f5f80619d24e5233666644dfb;p=libsigrok.git

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index f7b1dcba..cfc2dafb 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -434,9 +434,11 @@ set<const ConfigKey *> Driver::scan_options() const
 {
 	GArray *opts = sr_driver_scan_options_list(_structure);
 	set<const ConfigKey *> result;
-	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;
 }