summaryrefslogtreecommitdiffstats
path: root/lib.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2017-11-15 20:17:59 -0800
committerKaz Kylheku <kaz@kylheku.com>2017-11-15 20:17:59 -0800
commit89b51ce4482c0d10abe2947fb02876784119e091 (patch)
tree8d2f3d3b682104b51c82c9a66346afdf833d3770 /lib.c
parent5110262829dd1324e4a1a7ba4e2f0a733f63b728 (diff)
downloadtxr-89b51ce4482c0d10abe2947fb02876784119e091.tar.gz
txr-89b51ce4482c0d10abe2947fb02876784119e091.tar.bz2
txr-89b51ce4482c0d10abe2947fb02876784119e091.zip
find-max: bugfix for zero length vectors.
* lib.c (find_max): Fix a regression introduced in recent work: only execute the loop when the vector isn't empty.
Diffstat (limited to 'lib.c')
-rw-r--r--lib.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/lib.c b/lib.c
index 09494778..cfd538df 100644
--- a/lib.c
+++ b/lib.c
@@ -8567,21 +8567,26 @@ val find_max(val seq, val testfun, val keyfun)
case SEQ_VECLIKE:
{
val vec = si.obj;
- val maxelt = ref(vec, zero);
- val maxkey = funcall1(keyfun, maxelt);
val len = length(vec);
- val i;
- for (i = one; lt(i, len); i = succ(i)) {
- val elt = ref(vec, i);
- val key = funcall1(keyfun, elt);
- if (funcall2(testfun, key, maxkey)) {
- maxkey = key;
- maxelt = elt;
+ if (len != zero) {
+ val maxelt = ref(vec, zero);
+ val maxkey = funcall1(keyfun, maxelt);
+ val i;
+
+ for (i = one; lt(i, len); i = succ(i)) {
+ val elt = ref(vec, i);
+ val key = funcall1(keyfun, elt);
+ if (funcall2(testfun, key, maxkey)) {
+ maxkey = key;
+ maxelt = elt;
+ }
}
+
+ return maxelt;
}
- return maxelt;
+ return nil;
}
case SEQ_NOTSEQ:
default: