MonetDB: Jul2017 - malloc failures check

[Pedro Ferreira]

Changeset: 548a3412f42d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=548a3412f42d
Modified Files:
        sql/server/rel_schema.c
        sql/server/rel_semantic.c
Branch: Jul2017
Log Message:

malloc failures check


diffs (50 lines):

diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -228,6 +228,9 @@ table_constraint_name(symbol *s, sql_tab
        while (len + slen >= buflen)
                buflen += BUFSIZ;
        buf = malloc(buflen);
+       if(!buf) {
+               return NULL;
+       }
        strcpy(buf, t->base.name);
 
        /* add column name(s) */
@@ -236,6 +239,9 @@ table_constraint_name(symbol *s, sql_tab
                while (len + slen + 1 >= buflen) {
                        buflen += BUFSIZ;
                        buf = realloc(buf, buflen);
+                       if(!buf) {
+                               return NULL;
+                       }
                }
                snprintf(buf + len, buflen - len, "_%s", nms->data.sval);
                len += slen + 1;
@@ -246,6 +252,9 @@ table_constraint_name(symbol *s, sql_tab
        while (len + slen >= buflen) {
                buflen += BUFSIZ;
                buf = realloc(buf, buflen);
+               if(!buf) {
+                       return NULL;
+               }
        }
        snprintf(buf + len, buflen - len, "%s", suffix);
 
diff --git a/sql/server/rel_semantic.c b/sql/server/rel_semantic.c
--- a/sql/server/rel_semantic.c
+++ b/sql/server/rel_semantic.c
@@ -42,8 +42,12 @@ rel_parse(mvc *m, sql_schema *s, char *q
                m->session->schema = s;
 
        b = (buffer*)GDKmalloc(sizeof(buffer));
+       if (!b) {
+               return NULL;
+       }
        n = GDKmalloc(len + 1 + 1);
-       if (!b || !n) {
+       if (!n) {
+               GDKfree(b);
                return NULL;
        }
        strncpy(n, query, len);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list