Changeset: ba7cf9c18c54 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba7cf9c18c54
Modified Files:
gdk/gdk_select.c
Branch: Feb2013
Log Message:
Fix for 6455a3437ec6: s (candidate list) can be NULL.
diffs (19 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -803,10 +803,11 @@ BATsubselect(BAT *b, BAT *s, const void
return NULL;
}
- if (b->U->count == 0 || (s && s->U->count == 0) ||
- (BATtdense(s) &&
- (s->tseqbase >= b->hseqbase + BATcount(b) ||
- s->tseqbase + BATcount(s) <= b->hseqbase))) {
+ if (b->U->count == 0 ||
+ (s && (s->U->count == 0 ||
+ (BATtdense(s) &&
+ (s->tseqbase >= b->hseqbase + BATcount(b) ||
+ s->tseqbase + BATcount(s) <= b->hseqbase))))) {
/* trivially empty result */
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
",s=%s,anti=%d): trivially empty\n",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
