Changeset: 83a3b3fc61a9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83a3b3fc61a9 Modified Files: gdk/gdk_select.c Branch: Oct2014 Log Message:
Do not look beyond the end of the candidate list.
diffs (35 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -226,24 +226,26 @@ do {
\
e = (BUN) (i+limit-pr_off+off); \
if (im[icnt] & mask) { \
if ((im[icnt] & ~innermask) == 0) { \
- while (o < e && p < q) { \
+ while (p < q && o < e) { \
v = src[o-off]; \
ADD; \
cnt++; \
p++; \
- CAND; \
+ if (p < q) \
+ CAND; \
} \
} else { \
- while (o < e && p < q) { \
+ while (p < q && o < e) { \
v = src[o-off]; \
ADD; \
cnt += (TEST); \
p++; \
- CAND; \
+ if (p < q) \
+ CAND; \
} \
} \
} else { \
- while (o < e && p <= q) { \
+ while (p <= q && o < e) { \
p++; \
CAND; \
} \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
