BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Uwe Hermann 2018-04-24 08:55:36 +02:00
parent ce97fc3f6a
commit eca9772971
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/soft-trigger.c
View File

@ -39,7 +39,12 @@ SR_PRIV struct soft_trigger_logic *soft_trigger_logic_new(
stl->prev_sample = g_malloc0(stl->unitsize); stl->prev_sample = g_malloc0(stl->unitsize);
stl->pre_trigger_size = stl->unitsize * pre_trigger_samples; stl->pre_trigger_size = stl->unitsize * pre_trigger_samples;
stl->pre_trigger_buffer = g_try_malloc(stl->pre_trigger_size); 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); soft_trigger_logic_free(stl);
return NULL; return NULL;
} }