Changeset: 29b11d2100b0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29b11d2100b0
Modified Files:
gdk/gdk_batop.mx
Branch: Aug2011
Log Message:
Do the dereference after the null check.
diffs (16 lines):
diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -439,10 +439,10 @@ BATins(BAT *b, BAT *n, bit force)
BAT *
BATappend(BAT *b, BAT *n, bit force)
{
- BUN sz = BATcount(n);
+ BUN sz;
int fastpath = 1;
- if (b == NULL || n == NULL || sz == 0) {
+ if (b == NULL || n == NULL || (sz = BATcount(n)) == 0) {
return b;
}
ALIGNapp(b, "BATappend", force);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list