MonetDB: xid - XIDencode(): re-activate crucial assertions that ...

[Stefan Manegold]

Changeset: 3d0b5778da96 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d0b5778da96
Modified Files:
        monetdb5/modules/mal/xid.c
Branch: xid
Log Message:

XIDencode(): re-activate crucial assertions that detect/prevent underflow


diffs (22 lines):

diff --git a/monetdb5/modules/mal/xid.c b/monetdb5/modules/mal/xid.c
--- a/monetdb5/modules/mal/xid.c
+++ b/monetdb5/modules/mal/xid.c
@@ -71,8 +71,7 @@ XIDencode(BUN *rtrn, XIDcolumn col, oid 
        //xid point=0, range=0,set=0;
 
        o = *(oid*) p++;
-       //assert(o >= min);
-       //assert(o <= XID_VAL_MAX);
+       assert(o >= min);
        if ( o - min  >= XID_VAL_MAX) {
                col[i].x.tag = XIDBASE;
                min= col[++i].count = o;
@@ -87,7 +86,7 @@ XIDencode(BUN *rtrn, XIDcolumn col, oid 
        
        for ( ; p<q ; p++) {
                o = *(oid*) p;
-               //assert(o >= min);
+               assert(o >= min);
                if ( o - min >= XID_VAL_MAX) {
                        switch( col[i].x.tag){
                        case XIDRANGEEQ:
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list