X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsoft-trigger.c;h=0c5bb466da416100719f617c397badf7f4ca8d63;hb=e803574173bdac8a7f33085a648c29eaf248a394;hp=50fdd41cec094999764311fc66475dcfbb1f91dc;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/soft-trigger.c b/src/soft-trigger.c
index 50fdd41c..0c5bb466 100644
--- a/src/soft-trigger.c
+++ b/src/soft-trigger.c
@@ -22,9 +22,24 @@
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
-/* @cond PRIVATE */
+/** @cond PRIVATE */
 #define LOG_PREFIX "soft-trigger"
-/* @endcond */
+/** @endcond */
+
+SR_PRIV int logic_channel_unitsize(GSList *channels)
+{
+	int number = 0;
+	struct sr_channel *channel;
+	GSList *l;
+
+	for (l = channels; l; l = l->next) {
+		channel = l->data;
+		if (channel->type == SR_CHANNEL_LOGIC)
+			number++;
+	}
+
+	return (number + 7) / 8;
+}
 
 SR_PRIV struct soft_trigger_logic *soft_trigger_logic_new(
 		const struct sr_dev_inst *sdi, struct sr_trigger *trigger,
@@ -35,10 +50,19 @@ SR_PRIV struct soft_trigger_logic *soft_trigger_logic_new(
 	stl = g_malloc0(sizeof(struct soft_trigger_logic));
 	stl->sdi = sdi;
 	stl->trigger = trigger;
-	stl->unitsize = (g_slist_length(sdi->channels) + 7) / 8;
+	stl->unitsize = logic_channel_unitsize(sdi->channels);
 	stl->prev_sample = g_malloc0(stl->unitsize);
 	stl->pre_trigger_size = stl->unitsize * pre_trigger_samples;
-	stl->pre_trigger_buffer = g_malloc(stl->pre_trigger_size);
+	stl->pre_trigger_buffer = g_try_malloc(stl->pre_trigger_size);
+	if (pre_trigger_samples > 0 && !stl->pre_trigger_buffer) {
+		/*
+		 * Error out if g_try_malloc() failed (or was invoked as
+		 * g_try_malloc(0)) *and* more than 0 pretrigger samples
+		 * were requested.
+		 */
+		soft_trigger_logic_free(stl);
+		return NULL;
+	}
 	stl->pre_trigger_head = stl->pre_trigger_buffer;
 
 	if (stl->pre_trigger_size > 0 && !stl->pre_trigger_buffer) {