summaryrefslogtreecommitdiff
path: root/enum.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-04 18:42:19 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-04 18:42:19 +0000
commit4758d6584ec5c4056e76916e8aeecc5e5d61af12 (patch)
treee277bb012f4ce5742369eca873489c156e28fd07 /enum.c
parent3d6acf9d1685b66641c4dd7ff9acea620fba2ba9 (diff)
merge revision(s) 52026: [Backport #11471]
* enum.c (nmin_filter): Fix limit value. patch by Helder Pereira. [Bug #11471] [ruby-core:70477] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enum.c')
-rw-r--r--enum.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/enum.c b/enum.c
index a3669802d6..7c06458e5a 100644
--- a/enum.c
+++ b/enum.c
@@ -1148,6 +1148,7 @@ nmin_filter(struct nmin_data *data)
long numelts;
long left, right;
+ long store_index;
long i, j;
@@ -1173,7 +1174,6 @@ nmin_filter(struct nmin_data *data)
while (1) {
long pivot_index = left + (right-left)/2;
- long store_index;
long num_pivots = 1;
SWAP(pivot_index, right);
@@ -1217,9 +1217,9 @@ nmin_filter(struct nmin_data *data)
#undef GETPTR
#undef SWAP
+ data->limit = RARRAY_PTR(data->buf)[store_index*eltsize];
data->curlen = data->n;
rb_ary_resize(data->buf, data->n * eltsize);
- data->limit = RARRAY_PTR(data->buf)[(data->n-1)*eltsize];
}
static VALUE
@@ -1239,7 +1239,7 @@ nmin_i(VALUE i, VALUE *_data, int argc, VALUE *argv)
int c = data->cmpfunc(&cmpv, &data->limit, data);
if (data->rev)
c = -c;
- if (c > 0)
+ if (c >= 0)
return Qnil;
}