Changeset: 4438fea68169 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4438fea68169
Modified Files:
        monetdb5/mal/mal_builder.c
Branch: default
Log Message:

GDKmalloc failure defense line


diffs (16 lines):

diff --git a/monetdb5/mal/mal_builder.c b/monetdb5/mal/mal_builder.c
--- a/monetdb5/mal/mal_builder.c
+++ b/monetdb5/mal/mal_builder.c
@@ -520,8 +520,11 @@ pushNil(MalBlkPtr mb, InstrPtr q, int tp
                        cst.vtype=TYPE_void;
                        cst.val.oval= oid_nil;
                } else if (ATOMextern(tpe)) {
-                       // FIXME unchecked_malloc ATOMnil can return NULL
                        ptr p = ATOMnil(tpe);
+                       if( p == NULL){
+                               freeInstruction(q);
+                               return NULL;
+                       }
                        VALset(&cst, tpe, p);
                } else {
                        if (VALinit(&cst, tpe, ATOMnilptr(tpe)) == NULL) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to