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

Merge pull request #343 from nyalldawson/fix_index_read_errors

Browse Source 
Fix accidental reads of non-index data as indices
This commit is contained in:
Evan Miller
2021-08-29 07:20:27 -04:00
committed by GitHub
parent 9b57c3ff66 d94796d79b
commit 92dc91bfe8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libmdb/index.c
View File

@@ -236,7 +236,7 @@ mdb_read_indices(MdbTableDef *table)
*/ */
//fprintf(stderr, "num_idxs:%d num_real_idxs:%d\n", table->num_idxs, table->num_real_idxs); //fprintf(stderr, "num_idxs:%d num_real_idxs:%d\n", table->num_idxs, table->num_real_idxs);
table->num_real_idxs = 0; unsigned int num_idxs_type_other_than_2 = 0;
tmpbuf = g_malloc(idx2_sz); tmpbuf = g_malloc(idx2_sz);
for (i=0;i<table->num_idxs;i++) { for (i=0;i<table->num_idxs;i++) {
if (!read_pg_if_n(mdb, tmpbuf, &cur_pos, idx2_sz)) { if (!read_pg_if_n(mdb, tmpbuf, &cur_pos, idx2_sz)) {
@@ -264,8 +264,11 @@ mdb_read_indices(MdbTableDef *table)
fprintf(stderr, "idx #%d: %d %d %d %d %d/%d\n", i, idx_marker, rel_idx_type, rel_idx_number, rel_idx_page, update_action_flags, delete_action_flags); fprintf(stderr, "idx #%d: %d %d %d %d %d/%d\n", i, idx_marker, rel_idx_type, rel_idx_number, rel_idx_page, update_action_flags, delete_action_flags);
}*/ }*/
if (pidx->index_type!=2) if (pidx->index_type!=2)
table->num_real_idxs++; num_idxs_type_other_than_2++;
} }
if (num_idxs_type_other_than_2<table->num_real_idxs)
table->num_real_idxs=num_idxs_type_other_than_2;
//fprintf(stderr, "num_idxs:%d num_real_idxs:%d\n", table->num_idxs, table->num_real_idxs); //fprintf(stderr, "num_idxs:%d num_real_idxs:%d\n", table->num_idxs, table->num_real_idxs);
g_free(tmpbuf); g_free(tmpbuf);