MonetDB: Jan2014 - Fix for previous fixes :-).

[Sjoerd Mullender]

Changeset: 396d0130f549 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=396d0130f549
Modified Files:
        common/utils/mutils.c
        monetdb5/mal/mal_linker.c
Branch: Jan2014
Log Message:

Fix for previous fixes :-).


diffs (24 lines):

diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -82,7 +82,7 @@ opendir(const char *dirname)
        }
        result->find_file_data = malloc(sizeof(WIN32_FIND_DATA));
        result->dir_name = strdup(dirname);
-       if (result->find_file_data == NULL || result->dir_name) {
+       if (result->find_file_data == NULL || result->dir_name == NULL) {
                if (result->find_file_data)
                        free(result->find_file_data);
                if (result->dir_name)
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -282,7 +282,7 @@ loadLibrary(str filename, int flag)
                showException(GDKout, MAL,"loadModule", "internal error, too 
many modules loaded");
        } else {
                filesLoaded[lastfile].filename = GDKstrdup(filename);
-               filesLoaded[lastfile].fullname = GDKstrdup(nme);
+               filesLoaded[lastfile].fullname = GDKstrdup(handle ? nme : "");
                filesLoaded[lastfile].handle = handle;
                lastfile ++;
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list