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

output/analog: Allocate correct buffer size for sr_analog_to_float().

This commit is contained in:
Martin Ling 2015-09-10 00:45:32 +01:00 committed by Uwe Hermann
parent 39e0113533
commit fa74a26bc9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/output/analog.c
View File

@ -315,7 +315,9 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
break; break;
case SR_DF_ANALOG2: case SR_DF_ANALOG2:
analog2 = packet->payload; analog2 = packet->payload;
if (!(fdata = g_try_malloc(analog2->num_samples * sizeof(float)))) num_channels = g_slist_length(analog2->meaning->channels);
if (!(fdata = g_try_malloc(
analog2->num_samples * num_channels * sizeof(float))))
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
if ((ret = sr_analog_to_float(analog2, fdata)) != SR_OK) if ((ret = sr_analog_to_float(analog2, fdata)) != SR_OK)
return ret; return ret;
@ -330,7 +332,6 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
digits = 6; digits = 6;
} }
sr_analog_unit_to_string(analog2, &suffix); sr_analog_unit_to_string(analog2, &suffix);
num_channels = g_slist_length(analog2->meaning->channels);
for (i = 0; i < analog2->num_samples; i++) { for (i = 0; i < analog2->num_samples; i++) {
for (l = analog2->meaning->channels, c = 0; l; l = l->next, c++) { for (l = analog2->meaning->channels, c = 0; l; l = l->next, c++) {
ch = l->data; ch = l->data;