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

Fix crash when the catalog table is invalid

Browse Source
This commit is contained in:
Evan Miller 2020-08-05 17:01:08 -04:00
parent cde53c4332
commit 0c5f73d1d7
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libmdb/catalog.c
View File

@ -96,15 +96,24 @@ GPtrArray *mdb_read_catalog (MdbHandle *mdb, int objtype)
/* mdb_table_dump(&msysobj); */ /* mdb_table_dump(&msysobj); */
table = mdb_read_table(&msysobj); table = mdb_read_table(&msysobj);
if (!table) return NULL; if (!table) {
mdb_free_catalog(mdb);
goto cleanup;
}
mdb_read_columns(table); mdb_read_columns(table);
mdb_bind_column_by_name(table, "Id", obj_id, NULL); if (mdb_bind_column_by_name(table, "Id", obj_id, NULL) == -1 ||
mdb_bind_column_by_name(table, "Name", obj_name, NULL); mdb_bind_column_by_name(table, "Name", obj_name, NULL) == -1 ||
mdb_bind_column_by_name(table, "Type", obj_type, NULL); mdb_bind_column_by_name(table, "Type", obj_type, NULL) == -1 ||
mdb_bind_column_by_name(table, "Flags", obj_flags, NULL); mdb_bind_column_by_name(table, "Flags", obj_flags, NULL) == -1) {
i = mdb_bind_column_by_name(table, "LvProp", obj_props, &kkd_size_ole); mdb_free_catalog(mdb);
goto cleanup;
}
if ((i = mdb_bind_column_by_name(table, "LvProp", obj_props, &kkd_size_ole)) == -1) {
mdb_free_catalog(mdb);
goto cleanup;
}
col_props = g_ptr_array_index(table->columns, i-1); col_props = g_ptr_array_index(table->columns, i-1);
mdb_rewind_table(table); mdb_rewind_table(table);
@ -133,7 +142,9 @@ GPtrArray *mdb_read_catalog (MdbHandle *mdb, int objtype)
} }
//mdb_dump_catalog(mdb, MDB_TABLE); //mdb_dump_catalog(mdb, MDB_TABLE);
mdb_free_tabledef(table); cleanup:
if (table)
mdb_free_tabledef(table);
return mdb->catalog; return mdb->catalog;
} }