X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=794e4b56c3e73d36dbb0b8ed9fa342fa2f2df982;hp=8d0bbe5da8df7803c1f74855db7e26617d843897;hb=491e882048295442b38bb4c24d830302a23c0b70;hpb=a2e8008830a99fe0e45399e4360f2d77ce577f2c diff --git a/parsers.c b/parsers.c index 8d0bbe5..794e4b5 100644 --- a/parsers.c +++ b/parsers.c @@ -51,7 +51,7 @@ char **parse_probestring(int max_probes, const char *probestring) b = strtol(range[0], NULL, 10); e = strtol(range[1], NULL, 10); - if (b < 1 || e > max_probes || b >= e) { + if (b < 0 || e >= max_probes || b >= e) { g_critical("Invalid probe range '%s'.", tokens[i]); error = TRUE; break; @@ -59,24 +59,24 @@ char **parse_probestring(int max_probes, const char *probestring) while (b <= e) { snprintf(str, 7, "%d", b); - probelist[b - 1] = g_strdup(str); + probelist[b] = g_strdup(str); b++; } } else { tmp = strtol(tokens[i], NULL, 10); - if (tmp < 1 || tmp > max_probes) { + if (tmp < 0 || tmp >= max_probes) { g_critical("Invalid probe %d.", tmp); error = TRUE; break; } if ((name = strchr(tokens[i], '='))) { - probelist[tmp - 1] = g_strdup(++name); - if (strlen(probelist[tmp - 1]) > SR_MAX_PROBENAME_LEN) - probelist[tmp - 1][SR_MAX_PROBENAME_LEN] = 0; + probelist[tmp] = g_strdup(++name); + if (strlen(probelist[tmp]) > SR_MAX_PROBENAME_LEN) + probelist[tmp][SR_MAX_PROBENAME_LEN] = 0; } else { snprintf(str, 7, "%d", tmp); - probelist[tmp - 1] = g_strdup(str); + probelist[tmp] = g_strdup(str); } } }