MonetDB: Jul2021 - Clean up after and check for errors.

[Sjoerd Mullender]

Changeset: 04b982b956c3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/04b982b956c3
Modified Files:
        monetdb5/modules/mal/remote.c
Branch: Jul2021
Log Message:

Clean up after and check for errors.


diffs (21 lines):

diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -1518,10 +1518,16 @@ static str RMTbincopyto(Client cntxt, Ma
 
        sendtheap = b->ttype != TYPE_void && b->tvarsized;
        if (isVIEW(b) && sendtheap && VIEWvtparent(b) && BATcount(b) < 
BATcount(BBP_cache(VIEWvtparent(b)))) {
-               if ((b = BATdescriptor(bid)) == NULL)
+               if ((b = BATdescriptor(bid)) == NULL) {
+                       BBPunfix(bid);
                        throw(MAL, "remote.bincopyto", RUNTIME_OBJECT_MISSING);
+               }
                v = COLcopy(b, b->ttype, true, TRANSIENT);
                BBPunfix(b->batCacheid);
+               if (v == NULL) {
+                       BBPunfix(bid);
+                       throw(MAL, "remote.bincopyto", GDK_EXCEPTION);
+               }
        }
 
        mnstr_printf(cntxt->fdout, /*JSON*/"{"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list