From 8c1d95a438e5798e257e8a37f541c7cb839a24fc Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 11 Mar 2013 10:28:25 -0700 Subject: [PATCH] Fix f97552a83abb085bc44b1b578e550d64c1313a4b Causes Bus Error on SPARC --- libraries/liblmdb/mdb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 1d361a7..69abea7 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -4110,16 +4110,18 @@ mdb_page_search(MDB_cursor *mc, MDB_val *key, int flags) if (*mc->mc_dbflag & DB_STALE) { MDB_val data; int exact = 0; + uint16_t flags; MDB_node *leaf = mdb_node_search(&mc2, &mc->mc_dbx->md_name, &exact); if (!exact) return MDB_NOTFOUND; mdb_node_read(mc->mc_txn, leaf, &data); + memcpy(&flags, ((char *) data.mv_data + offsetof(MDB_db, md_flags)), + sizeof(uint16_t)); /* 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))) + if (mc->mc_db->md_flags != flags) return MDB_INCOMPATIBLE; memcpy(mc->mc_db, data.mv_data, sizeof(MDB_db)); }