Merge branch 'PHP-8.0' into PHP-8.1

derickr · derickr · commit d8ebfdc5067a · 2022-07-04T10:50:32.000+01:00
diff --git a/ext/dba/dba_lmdb.c b/ext/dba/dba_lmdb.c
@@ -254,6 +254,7 @@ DBA_DELETE_FUNC(lmdb)
 
 	php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
 
+	mdb_txn_abort(LMDB_IT(txn));
 	return FAILURE;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,7 @@ DBA_DELETE_FUNC(lmdb)`
`254`	`254`
`255`	`255`	`php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));`
`256`	`256`
	`257`	`+ mdb_txn_abort(LMDB_IT(txn));`
`257`	`258`	`return FAILURE;`
`258`	`259`	`}`
`259`	`260`