MonetDB: default - If you allocate memory, you should also free ...

[Sjoerd Mullender]

Changeset: 452c34b9875d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=452c34b9875d
Modified Files:
        gdk/gdk_logger.c
        gdk/gdk_storage.c
Branch: default
Log Message:

If you allocate memory, you should also free it at some point.


diffs (36 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -904,6 +904,7 @@ logger_open(logger *lg)
        filename = GDKfilepath(BBPselectfarm(lg->dbfarm_role, 0, offheap), 
lg->dir, LOGFILE, id);
 
        lg->log = open_wstream(filename);
+       GDKfree(filename);
        lg->end = 0;
 
        if (lg->log == NULL || mnstr_errnr(lg->log) || log_sequence_nrs(lg) != 
LOG_OK) {
@@ -940,6 +941,7 @@ logger_readlog(logger *lg, char *filenam
        }
 
        lg->log = open_rstream(path);
+       GDKfree(path);
 
        /* if the file doesn't exist, there is nothing to be read back */
        if (!lg->log || mnstr_errnr(lg->log)) {
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -255,8 +255,11 @@ GDKfileopen(int farmid, const char * dir
        }
 
        if (path != NULL) {
-        IODEBUG THRprintf(GDKstdout, "#GDKfileopen(%s)\n", path);
-               return fopen(path, mode);
+               FILE *f;
+               IODEBUG fprintf(stderr, "#GDKfileopen(%s)\n", path);
+               f = fopen(path, mode);
+               GDKfree(path);
+               return f;
        }
        return NULL;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list