MonetDB: Jun2016 - Use overflow check correctly.

[Sjoerd Mullender]

Changeset: 884da1904838 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=884da1904838
Modified Files:
        gdk/gdk_join.c
Branch: Jun2016
Log Message:

Use overflow check correctly.


diffs (15 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -144,9 +144,9 @@ joininitresults(BAT **r1p, BAT **r2p, BU
                if (lcnt == 0 || rcnt == 0)
                        maxsize = nil_on_miss ? lcnt : 0;
                else if (BUN_MAX / lcnt >= rcnt)
+                       maxsize = lcnt * rcnt;
+               else
                        maxsize = BUN_MAX;
-               else
-                       maxsize = lcnt * rcnt;
        }
        size = estimate == BUN_NONE ? lcnt : estimate;
        if (size > maxsize)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list