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

output/csv: silence NULL dereference compiler warnings 

Check pointers' validity before dereferencing them.

This was reported by clang's scan-build.
This commit is contained in:
Gerhard Sittig 2018-02-08 22:04:49 +01:00
parent 603643fa71
commit a21fef07b6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/csv.c
View File

@ -216,7 +216,7 @@ static GString *gen_header(const struct sr_output *o,
struct sr_channel *ch;
GVariant *gvar;
GString *header;
GSList *l;
GSList *channels, *l;
unsigned int num_channels, i;
uint64_t samplerate = 0, sr;
char *samplerate_s;
@ -256,18 +256,20 @@ static GString *gen_header(const struct sr_output *o,
ctx->title, ctime(&hdr->starttime.tv_sec));
/* Columns / channels */
num_channels = g_slist_length(o->sdi->channels);
channels = o->sdi ? o->sdi->channels : NULL;
num_channels = g_slist_length(channels);
g_string_append_printf(header, "%s Channels (%d/%d):",
ctx->comment, ctx->num_analog_channels +
ctx->num_logic_channels, num_channels);
for (l = o->sdi->channels; l; l = l->next) {
for (l = channels; l; l = l->next) {
ch = l->data;
if (ch->enabled)
g_string_append_printf(header, " %s,", ch->name);
}
if (o->sdi->channels)
if (channels) {
/* Drop last separator. */
g_string_truncate(header, header->len - 1);
}
g_string_append_printf(header, "\n");
if (samplerate != 0) {
samplerate_s = sr_samplerate_string(samplerate);