Abort LMDB transaction whe trying to delete non-existing key

Girgias · Girgias · commit 8fce70ae7be3 · 2022-07-01T17:26:27.000+01:00
diff --git a/NEWS b/NEWS
@@ -6,6 +6,10 @@ PHP                                                                        NEWS
   . Fixed bug #80047 (DatePeriod doesn't warn with custom DateTimeImmutable).
     (Derick)
 
+- DBA:
+  . Fixed LMDB driver hanging when attempting to delete a non-existing key
+    (Girgias)
+
 - FPM:
   . Fixed zlog message prepend, free on incorrect address. (Heiko Weber)
 
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`