Merge remote-tracking branch 'origin/mdb.RE/0.9'

This commit is contained in:
Howard Chu 2016-01-29 00:57:31 +00:00
commit 207a43dac2
2 changed files with 2 additions and 1 deletions

View File

@ -6,6 +6,7 @@ LMDB 0.9.18 Release Engineering
Fix MDB_APPENDDUP vs. rewrite(single item) (ITS#8334) Fix MDB_APPENDDUP vs. rewrite(single item) (ITS#8334)
Fix mdb_copy of large files on Windows Fix mdb_copy of large files on Windows
Fix subcursor move after delete (ITS#8355) Fix subcursor move after delete (ITS#8355)
Fix mdb_midl_shirnk off-by-one (ITS#8363)
Check for utf8_to_utf16 failures (ITS#7992) Check for utf8_to_utf16 failures (ITS#7992)
Catch strdup failure in mdb_dbi_open Catch strdup failure in mdb_dbi_open
Build Build

View File

@ -120,7 +120,7 @@ void mdb_midl_shrink( MDB_IDL *idp )
{ {
MDB_IDL ids = *idp; MDB_IDL ids = *idp;
if (*(--ids) > MDB_IDL_UM_MAX && if (*(--ids) > MDB_IDL_UM_MAX &&
(ids = realloc(ids, (MDB_IDL_UM_MAX+1) * sizeof(MDB_ID)))) (ids = realloc(ids, (MDB_IDL_UM_MAX+2) * sizeof(MDB_ID))))
{ {
*ids++ = MDB_IDL_UM_MAX; *ids++ = MDB_IDL_UM_MAX;
*idp = ids; *idp = ids;