NextGraph
/
lmdb
mirror of https://github.com/nextgraph-org/lmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NULL key is allowed for MDB_CURRENT

Browse Source
vmware
Howard Chu 12 years ago
parent 48dc782ea6
commit 744e311939
1 changed files with 5 additions and 1 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      libraries/liblmdb/mdb.c

6
libraries/liblmdb/mdb.c
Unescape View File

@ -1095,6 +1095,10 @@ mdb_dkey(MDB_val *key, char *buf)
char *ptr = buf; char *ptr = buf;
unsigned char *c = key->mv_data; unsigned char *c = key->mv_data;
unsigned int i; unsigned int i;
if (!key)
return "";
if (key->mv_size > MDB_MAXKEYSIZE) if (key->mv_size > MDB_MAXKEYSIZE)
return "MDB_MAXKEYSIZE"; return "MDB_MAXKEYSIZE";
/* may want to make this a dynamic check: if the key is mostly /* may want to make this a dynamic check: if the key is mostly
@ -4823,7 +4827,7 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
if (F_ISSET(mc->mc_txn->mt_flags, MDB_TXN_RDONLY)) if (F_ISSET(mc->mc_txn->mt_flags, MDB_TXN_RDONLY))
return EACCES; return EACCES;
if (key->mv_size == 0 || key->mv_size > MDB_MAXKEYSIZE) if (flags != MDB_CURRENT && (key->mv_size == 0 || key->mv_size > MDB_MAXKEYSIZE))
return EINVAL; return EINVAL;
if (F_ISSET(mc->mc_db->md_flags, MDB_DUPSORT) && data->mv_size > MDB_MAXKEYSIZE) if (F_ISSET(mc->mc_db->md_flags, MDB_DUPSORT) && data->mv_size > MDB_MAXKEYSIZE)

Write Preview
Loading…
Cancel
Save