Skip to content

Commit fe86268

Browse files
committed
fix resetting cursor data if dba_firstkey failed
better symbol check fix config.m4
1 parent 9964721 commit fe86268

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ext/dba/config.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ if test "$PHP_LMDB" != "no"; then
245245

246246
if test -n "$THIS_INCLUDE"; then
247247
for LIB in lmdb; do
248-
PHP_CHECK_LIBRARY($LIB, mdb_open, [
248+
PHP_CHECK_LIBRARY($LIB, mdb_env_open, [
249249
AC_DEFINE_UNQUOTED(LMDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
250250
AC_DEFINE(DBA_LMDB, 1, [ ])
251251
THIS_LIBS=$LIB
@@ -663,7 +663,7 @@ if test "$HAVE_DBA" = "1"; then
663663
AC_MSG_RESULT([yes])
664664
fi
665665
AC_DEFINE(HAVE_DBA, 1, [ ])
666-
PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c dba_tcadb.c $cdb_sources $flat_sources $ini_sources, $ext_shared)
666+
PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c dba_tcadb.c dba_lmdb.c $cdb_sources $flat_sources $ini_sources, $ext_shared)
667667
PHP_ADD_BUILD_DIR($ext_builddir/libinifile)
668668
PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
669669
PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)

ext/dba/dba_lmdb.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ DBA_FIRSTKEY_FUNC(lmdb)
269269
if (rc) {
270270
mdb_txn_abort(LMDB_IT(txn));
271271
mdb_cursor_close(LMDB_IT(cur));
272+
LMDB_IT(cur) = NULL;
272273
if (MDB_NOTFOUND != rc) {
273274
php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
274275
}

0 commit comments

Comments
 (0)