lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-09-20 19:27:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #175 from nyalldawson/missing_file_crash2

Browse Source 
Fix crash when a missing file is accessed via ODBC
This commit is contained in:
Evan Miller
2020-10-12 07:17:50 -04:00
committed by GitHub
parent 8e6ebfc411 3ac497c6ff
commit 02735e10db
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/sql/mdbsql.c
View File

@@ -161,12 +161,26 @@ MdbHandle *mdb_sql_open(MdbSQL *sql, char *db_name)
#ifdef HAVE_WORDEXP #ifdef HAVE_WORDEXP
wordexp_t words; wordexp_t words;
int need_free_words = 0;
if (wordexp(db_name, &words, 0)==0) { switch (wordexp(db_name, &words, 0))
if (words.we_wordc>0) {
db_namep = words.we_wordv[0]; case 0:
if (words.we_wordc>0)
{
db_namep = words.we_wordv[0];
}
need_free_words = 1;
break;
case WRDE_NOSPACE:
// If the error was WRDE_NOSPACE, then perhaps part of the result was allocated.
need_free_words = 1;
break;
default:
// Some other error
need_free_words = 0;
break;
} }
#endif #endif
sql->mdb = mdb_open(db_namep, MDB_NOFLAGS); sql->mdb = mdb_open(db_namep, MDB_NOFLAGS);
@@ -180,7 +194,10 @@ MdbHandle *mdb_sql_open(MdbSQL *sql, char *db_name)
} }
#ifdef HAVE_WORDEXP #ifdef HAVE_WORDEXP
wordfree(&words); if ( need_free_words )
{
wordfree(&words);
}
#endif #endif
return sql->mdb; return sql->mdb;