input/csv: stricter input data test for multi column mode

[libsigrok.git] / src / input / csv.c

diff --git a/src/input/csv.c b/src/input/csv.c
index 6d3264902362f04363deb6e2b28e7c22748cf82c..895c1c6d8c175031b3f97282e42adfe2df1696d4 100644 (file)
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -446,13 +446,13 @@ static int parse_multi_columns(char **columns, struct context *inc)
 
        for (i = 0; i < inc->num_channels; i++) {
                column = columns[i];
-               if (column[0] == '1') {
+               if (strcmp(column, "1") == 0) {
                        inc->sample_buffer[i / 8] |= (1 << (i % 8));
                } else if (!strlen(column)) {
                        sr_err("Column %zu in line %zu is empty.",
                                inc->first_channel + i, inc->line_number);
                        return SR_ERR;
-               } else if (column[0] != '0') {
+               } else if (strcmp(column, "0") != 0) {
                        sr_err("Invalid value '%s' in column %zu in line %zu.",
                                column, inc->first_channel + i,
                                inc->line_number);