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

Merge branch 'master' into backend-thread-safety

Browse Source
This commit is contained in:
Evan Miller 2020-08-20 19:53:29 -04:00
commit 6d7a5c79af
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mdbtools.h
View File

@ -470,7 +470,7 @@ void mdb_free_catalog(MdbHandle *mdb);
GPtrArray *mdb_read_catalog(MdbHandle *mdb, int obj_type); GPtrArray *mdb_read_catalog(MdbHandle *mdb, int obj_type);
MdbCatalogEntry *mdb_get_catalogentry_by_name(MdbHandle *mdb, const gchar* name); MdbCatalogEntry *mdb_get_catalogentry_by_name(MdbHandle *mdb, const gchar* name);
void mdb_dump_catalog(MdbHandle *mdb, int obj_type); void mdb_dump_catalog(MdbHandle *mdb, int obj_type);
char *mdb_get_objtype_string(int obj_type); const char *mdb_get_objtype_string(int obj_type);
/* table.c */ /* table.c */
MdbTableDef *mdb_alloc_tabledef(MdbCatalogEntry *entry); MdbTableDef *mdb_alloc_tabledef(MdbCatalogEntry *entry);

6
src/libmdb/catalog.c
View File

@ -18,10 +18,10 @@
#include "mdbtools.h" #include "mdbtools.h"
char * const char *
mdb_get_objtype_string(int obj_type) mdb_get_objtype_string(int obj_type)
{ {
static char *type_name[] = {"Form", static const char *type_name[] = {"Form",
"Table", "Table",
"Macro", "Macro",
"System Table", "System Table",
@ -35,7 +35,7 @@ static char *type_name[] = {"Form",
"Database" "Database"
}; };
if (obj_type > 11) { if (obj_type >= (int)(sizeof(type_name)/sizeof(type_name[0]))) {
return NULL; return NULL;
} else { } else {
return type_name[obj_type]; return type_name[obj_type];

4
src/odbc/odbc.c
View File

@ -1149,6 +1149,8 @@ SQLRETURN SQL_API SQLFreeStmt(
struct _hdbc *dbc = (struct _hdbc *) stmt->hdbc; struct _hdbc *dbc = (struct _hdbc *) stmt->hdbc;
TRACE("SQLFreeStmt"); TRACE("SQLFreeStmt");
free(stmt->ole_str);
stmt->ole_str = NULL;
if (fOption==SQL_DROP) { if (fOption==SQL_DROP) {
if (!g_ptr_array_remove(dbc->statements, stmt)) if (!g_ptr_array_remove(dbc->statements, stmt))
return SQL_INVALID_HANDLE; return SQL_INVALID_HANDLE;
@ -1163,8 +1165,6 @@ SQLRETURN SQL_API SQLFreeStmt(
/* Bound parameters not currently implemented */ /* Bound parameters not currently implemented */
} else { } else {
} }
free(stmt->ole_str);
stmt->ole_str = NULL;
return SQL_SUCCESS; return SQL_SUCCESS;
} }