Merge branch 'PHP-8.0' into PHP-8.1

Girgias · Girgias · commit 5a3774cac544 · 2021-11-03T15:01:56.000Z
* PHP-8.0:
  Fix Bug #81588 TokyoCabinet driver leaks memory
diff --git a/NEWS b/NEWS
@@ -13,6 +13,9 @@ PHP                                                                        NEWS
   . Fixed bug #81500 (Interval serialization regression since 7.3.14 / 7.4.2).
     (cmb)
 
+- DBA:
+  . Fixed bug #81588 (TokyoCabinet driver leaks memory). (girgias)
+
 - FPM:
   . Fixed bug #81026 (PHP-FPM oob R/W in root process leading to privilege
     escalation) (CVE-2021-21703). (Jakub Zelenka)
diff --git a/ext/dba/dba_tcadb.c b/ext/dba/dba_tcadb.c
@@ -79,6 +79,7 @@ DBA_CLOSE_FUNC(tcadb)
 	TCADB_DATA;
 
 	tcadbclose(dba->tcadb);
+	tcadbdel(dba->tcadb);
 	pefree(dba, info->flags & DBA_PERSISTENT);
 }
 
diff --git a/ext/dba/tests/dba_tcadb.phpt b/ext/dba/tests/dba_tcadb.phpt
@@ -9,6 +9,7 @@ dba
 ?>
 --FILE--
 <?php
+    $handler = 'tcadb';
     $lock_flag = 'l';
     $db_filename = $db_file = __DIR__ .'/test0.tch';
     @unlink($db_filename);

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ DBA_CLOSE_FUNC(tcadb)`
`79`	`79`	`TCADB_DATA;`
`80`	`80`
`81`	`81`	`tcadbclose(dba->tcadb);`
	`82`	`+ tcadbdel(dba->tcadb);`
`82`	`83`	`pefree(dba, info->flags & DBA_PERSISTENT);`
`83`	`84`	`}`
`84`	`85`