upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-30 11:39:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check DB flags when refreshing a stale MDB DBI.

Browse source 
It's hairy to figure out when a DBI is valid. Catch destructive
user errors, and flags which another process changed under us.
This commit is contained in:
Hallvard Furuseth 2013-02-19 22:02:37 +01:00
parent 2dbb8bb833
commit f97552a83a
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/liblmdb/lmdb.h
View file

@ -362,7 +362,9 @@ typedef enum MDB_cursor_op {
#define MDB_PAGE_FULL (-30786)
/** Database contents grew beyond environment mapsize */
#define MDB_MAP_RESIZED (-30785)
#define MDB_LAST_ERRCODE MDB_MAP_RESIZED
/** Operation is incompatible with database */
#define MDB_INCOMPATIBLE (-30784)
#define MDB_LAST_ERRCODE MDB_INCOMPATIBLE
/** @} */
/** @brief Statistics for a database in the environment */

7
libraries/liblmdb/mdb.c
View file

@ -1056,6 +1056,7 @@ static char *const mdb_errstr[] = {
"MDB_CURSOR_FULL: Internal error - cursor stack limit reached",
"MDB_PAGE_FULL: Internal error - page has no more space",
"MDB_MAP_RESIZED: Database contents grew beyond environment mapsize",
"MDB_INCOMPATIBLE: Operation is incompatible with database",
};
char *
@ -4056,6 +4057,12 @@ mdb_page_search(MDB_cursor *mc, MDB_val *key, int flags)
if (!exact)
return MDB_NOTFOUND;
mdb_node_read(mc->mc_txn, leaf, &data);
/* The txn may not know this DBI, or another process may
* have dropped and recreated the DB with other flags.
*/
if (mc->mc_db->md_flags != *(uint16_t *)
((char *) data.mv_data + offsetof(MDB_db, md_flags)))
return MDB_INCOMPATIBLE;
memcpy(mc->mc_db, data.mv_data, sizeof(MDB_db));
}
if (flags & MDB_PS_MODIFY)