Changeset: 105389b60f27 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/105389b60f27 Modified Files: sql/server/rel_file_loader.c sql/server/rel_select.c Branch: default Log Message:
case insensitive extension resolution bit more protection against null ptr diffs (27 lines): diff --git a/sql/server/rel_file_loader.c b/sql/server/rel_file_loader.c --- a/sql/server/rel_file_loader.c +++ b/sql/server/rel_file_loader.c @@ -49,6 +49,8 @@ fl_register(char *name, fl_add_types_fpt file_loader_t* fl_find(char *name) { + if (!name) + return NULL; for (int i = 0; i<NR_FILE_LOADERS; i++) { if (file_loaders[i].name && strcmp(file_loaders[i].name, name) == 0) return file_loaders+i; diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c --- a/sql/server/rel_select.c +++ b/sql/server/rel_select.c @@ -534,8 +534,10 @@ file_loader_add_table_column_types(mvc * char *filename = a->data.val.sval; char *ext = strrchr(filename, '.'); - if (ext) + if (ext) { ext=ext+1; + ext = toLower(ext); + } file_loader_t *fl = fl_find(ext); if (!fl) _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org