From 3fd50d06a12da8b4a9b4201272ca1f08fabd415e Mon Sep 17 00:00:00 2001 From: Jun-ichi Takimoto Date: Tue, 15 Nov 2016 00:17:35 +0900 Subject: 39937: fix a problem introduced by 39886. $a[i,j] should become an empty array if i>j. --- ChangeLog | 5 +++++ Src/params.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27e01c232..150430113 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-11-15 Jun-ichi Takimoto + + * 39937: Src/params.c: fix a problem introduced by 39886. + $a[i,j] should become an empty array if i>j. + 2016-11-14 Peter Stephenson * 39906: Src/utils.c: More optimisation of multibyte handling diff --git a/Src/params.c b/Src/params.c index 6f587a30a..3c8658cc3 100644 --- a/Src/params.c +++ b/Src/params.c @@ -2292,10 +2292,11 @@ getarrvalue(Value v) v->end += arrlen(s) + 1; /* Null if 1) array too short, 2) index still negative */ - if (arrlen_lt(s, v->start) || v->start < 0) { + if (v->end <= v->start) { + s = arrdup_max(nular, 0); + } + else if (arrlen_lt(s, v->start) || v->start < 0) { s = arrdup_max(nular, 1); - } else if (v->end <= v->start) { - s = arrdup_max(nular, 0); } else { /* Copy to a point before the end of the source array: * arrdup_max will copy at most v->end - v->start elements, -- cgit 1.4.1