output/csv: fix segfault when naming logic channels

'j' is the loop variable for channels, not 'i'.

This fixes parts of bug #844.

Reported-by: Maxim Sloyko <redacted>
Signed-off-by: Wolfram Sang <redacted>

diff --git a/src/output/csv.c b/src/output/csv.c
index 402ab904454c69cc0669d1152ad1810a6ad4dc8f..97102f45917482ee002e75caabe33754bcdfc0c3 100644 (file)
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -382,7 +382,7 @@ static void process_logic(struct context *ctx,
                                sample = logic->data + i;
                                idx = ctx->channels[ch].ch->index;
                                if (ctx->label_do && !ctx->label_names)
-                                       ctx->channels[i].label = "logic";
+                                       ctx->channels[j].label = "logic";
                                ctx->logic_samples[i * ctx->num_logic_channels + ch] = sample[idx / 8] & (1 << (idx % 8));
                        }
                        ch++;