X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=152f9790b818bcffc94a1e81b1796852abbe8ce4;hp=e692970d6b2cf70982ce66c4401a704f8b1fa498;hb=d6ebfaa8b6ceaf6f6b07c7d115e40fc3a7fde0cf;hpb=6af207e60b07dbbafc9675a30b0e44deb393a26b

diff --git a/session.c b/session.c
index e692970..152f979 100644
--- a/session.c
+++ b/session.c
@@ -577,12 +577,18 @@ void run_session(void)
 		}
 	}
 
+	/* This is unlikely to happen but it makes static analyzers stop complaining. */
+	if (!devices) {
+		g_critical("No real devices found.");
+		return;
+	}
+
 	sdi = devices->data;
 	g_slist_free(devices);
 	g_slist_free(real_devices);
 
 	sr_session_new(sr_ctx, &session);
-	sr_session_datafeed_callback_add(session, datafeed_in, NULL);
+	sr_session_datafeed_callback_add(session, datafeed_in, session);
 
 	if (sr_dev_open(sdi) != SR_OK) {
 		g_critical("Failed to open device.");
@@ -669,7 +675,7 @@ void run_session(void)
 
 	if (opt_frames) {
 		if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)) {
-			g_critical("Invalid sample limit '%s'.", opt_samples);
+			g_critical("Invalid frame limit '%s'.", opt_frames);
 			sr_session_destroy(session);
 			return;
 		}