Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix GH-9155: dba_open("non-existing", "c-", "flatfile") segfaults

Author: cmb69

NEWS

@@ -14,6 +14,8 @@ PHP                                                                        NEWS
 
 - DBA:
   . Fixed LMDB driver memory leak on DB creation failure (Girgias)
+  . Fixed bug GH-9155 (dba_open("non-existing", "c-", "flatfile") segfaults)
+    (cmb)
 
 - MBString:
   . Fixed bug GH-9008 (mb_detect_encoding(): wrong results with null $encodings).

ext/dba/dba.c

@@ -860,11 +860,10 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 				fcntl(info->fd, F_SETFL, flags & ~O_APPEND);
 #elif defined(PHP_WIN32)
 			} else if (modenr == DBA_CREAT && need_creation && !restarted) {
-				bool close_both;
-
-				close_both = (info->fp != info->lock.fp);
-				php_stream_free(info->lock.fp, persistent ? PHP_STREAM_FREE_CLOSE_PERSISTENT : PHP_STREAM_FREE_CLOSE);
-				if (close_both) {
+				if (info->lock.fp != NULL) {
+					php_stream_free(info->lock.fp, persistent ? PHP_STREAM_FREE_CLOSE_PERSISTENT : PHP_STREAM_FREE_CLOSE);
+				}
+				if (info->fp != info->lock.fp) {
 					php_stream_free(info->fp, persistent ? PHP_STREAM_FREE_CLOSE_PERSISTENT : PHP_STREAM_FREE_CLOSE);
 				}
 				info->fp = NULL;

ext/dba/tests/gh9155.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Bug GH-9155 (dba_open("non-existing", "c-", "flatfile") segfaults)
+--EXTENSIONS--
+dba
+--SKIPIF--
+<?php
+$handler = "flatfile";
+require_once(__DIR__ .'/skipif.inc');
+?>
+--FILE--
+<?php
+
+require_once(__DIR__ .'/test.inc');
+
+$db = dba_open($db_filename, 'c-', 'flatfile');
+var_dump($db);
+?>
+--CLEAN--
+<?php
+require_once(__DIR__ .'/clean.inc');
+?>
+--EXPECTF--
+resource(%d) of type (dba)