X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsoft-trigger.c;h=245eb4fff8c94ed652233de2676a341961eeb691;hb=fdcdfe53d8fa27e101f7d4b206f05a4f3513c306;hp=9c3963d3acf651baa3f19f9076c23bb5fb070841;hpb=98fec29ecbb5093856b69311be8e937c162edded;p=libsigrok.git

diff --git a/src/soft-trigger.c b/src/soft-trigger.c
index 9c3963d3..245eb4ff 100644
--- a/src/soft-trigger.c
+++ b/src/soft-trigger.c
@@ -17,14 +17,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /* @cond PRIVATE */
 #define LOG_PREFIX "soft-trigger"
 /* @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,
 		int pre_trigger_samples)
@@ -34,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) {