diff --git a/Src/params.c b/Src/params.c index 5fab84a..1e0bece 100644 --- a/Src/params.c +++ b/Src/params.c @@ -2290,14 +2290,24 @@ getarrvalue(Value v) v->start += arrlen(s); if (v->end < 0) v->end += arrlen(s) + 1; - if (arrlen_lt(s, v->start) || v->start < 0) + + /* Null if 1) array too short, 2) index still negative */ + if (arrlen_lt(s, v->start) || v->start < 0) { s = arrdup(nular); - else - s = arrdup(s + v->start); - if (v->end <= v->start) - s[0] = NULL; - else if (arrlen_ge(s, v->end - v->start)) - s[v->end - v->start] = NULL; + } else if (v->end <= v->start) { + s = arrdup_max(s, 1); + s[0] = NULL; + } else { + /* Here copying not till the end of the source array is handled + * -- arrdup_max will copy at most v->end - v->start elements, + * starting from v->start element. Original code said: + * s[v->end - v->start] = NULL + * which means that there are exactly the same number of + * elements as the value of the above *0-based* index. + * */ + s = arrdup_max(s + v->start, v->end - v->start); + } + return s; } diff --git a/Src/utils.c b/Src/utils.c index 733f570..e4351ad 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -4231,6 +4231,37 @@ arrdup(char **s) /**/ mod_export char ** +arrdup_max(char **s, unsigned max) +{ + char **x, **y, **s_bkp, *bkp; + int len; + + len = arrlen(s); + + /* Limit has sense only if not equal to len */ + if (max < len) { + s_bkp = s; + + /* Num. of elements == max, sentinel *index* is the same */ + bkp = s[max]; + s[max] = NULL; + } else { + max = len; + } + + y = x = (char **) zhalloc(sizeof(char *) * (max + 1)); + + while ((*x++ = dupstring(*s++))); + + if (max < len) { + s_bkp[max] = bkp; + } + + return y; +} + +/**/ +mod_export char ** zarrdup(char **s) { char **x, **y;