MonetDB: Dec2016 - Check return values and fix potential memory ...

[Sjoerd Mullender]

Changeset: 5cc9b08b2cf4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5cc9b08b2cf4
Modified Files:
        sql/common/sql_mem.c
Branch: Dec2016
Log Message:

Check return values and fix potential memory leak.


diffs (26 lines):

diff --git a/sql/common/sql_mem.c b/sql/common/sql_mem.c
--- a/sql/common/sql_mem.c
+++ b/sql/common/sql_mem.c
@@ -44,15 +44,20 @@ sql_ref_dec(sql_ref *r)
 sql_allocator *sa_create(void)
 {
        sql_allocator *sa = MNEW(sql_allocator);
-       if (!sa) {
+       if (sa == NULL) {
                return NULL;
        }
        sa->size = 64;
        sa->nr = 1;
        sa->blks = NEW_ARRAY(char*,sa->size);
+       if (sa->blks == NULL) {
+               _DELETE(sa);
+               return NULL;
+       }
        sa->blks[0] = NEW_ARRAY(char,SA_BLOCK);
        sa->usedmem = SA_BLOCK;
-       if (!sa->blks[0]) {
+       if (sa->blks[0] == NULL) {
+               _DELETE(sa->blks);
                _DELETE(sa);
                return NULL;
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list