MonetDB: default - One more missing check

[Pedro Ferreira]

Changeset: 37a13489ab1a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37a13489ab1a
Modified Files:
        sql/storage/bat/bat_storage.c
Branch: default
Log Message:

One more missing check


diffs (28 lines):

diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -3133,7 +3133,7 @@ static BAT *
 segments2cands(segment *s, sql_trans *tr, size_t start, size_t end)
 {
        size_t nr = end - start, pos = 0;
-       BAT *b = COLnew(0, TYPE_msk, nr, TRANSIENT);
+       BAT *b = COLnew(0, TYPE_msk, nr, TRANSIENT), *bn = NULL;
        if (!b)
                return NULL;
 
@@ -3159,10 +3159,13 @@ segments2cands(segment *s, sql_trans *tr
                }
                pos += lnr;
        }
-       b = BATmaskedcands(start, nr, b, true);
+       if (!(bn = BATmaskedcands(start, nr, b, true))) {
+               BBPreclaim(b);
+               return NULL;
+       }
        (void)pos;
        assert (pos == nr);
-       return b;
+       return bn;
 }
 
 static void *                                  /* BAT * */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list