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

soft-trigger: Use g_try_malloc() for potentially large allocation. 

This fixes bug #1000.
This commit is contained in:
Uwe Hermann 2018-04-21 23:27:00 +02:00
parent 567fe53822
commit d52107a159
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/soft-trigger.c
View File

@ -38,7 +38,11 @@ SR_PRIV struct soft_trigger_logic *soft_trigger_logic_new(
stl->unitsize = (g_slist_length(sdi->channels) + 7) / 8;
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 (!stl->pre_trigger_buffer) {
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) {