From: Uwe Hermann <redacted>
Date: Tue, 24 Apr 2018 06:55:36 +0000 (+0200)
Subject: soft-trigger: Fix an issue causing triggers to not work.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=eca9772971873206364e5cf9882c238766ac5dbb;p=libsigrok.git

soft-trigger: Fix an issue causing triggers to not work.
---

diff --git a/src/soft-trigger.c b/src/soft-trigger.c
index 083b003a..c92365e2 100644
--- a/src/soft-trigger.c
+++ b/src/soft-trigger.c
@@ -39,7 +39,12 @@ SR_PRIV struct soft_trigger_logic *soft_trigger_logic_new(
 	stl->prev_sample = g_malloc0(stl->unitsize);
 	stl->pre_trigger_size = stl->unitsize * pre_trigger_samples;
 	stl->pre_trigger_buffer = g_try_malloc(stl->pre_trigger_size);
-	if (!stl->pre_trigger_buffer) {
+	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;
 	}