php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix GH-16390: dba_open() can segfault for "pathless" streams
This commit is contained in:
Christoph M. Becker
2024-10-21 00:38:00 +02:00
parent bde23d0843 e635857f7d
commit 2c0fd883b2
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -28,6 +28,9 @@ PHP NEWS
. Fixed bug GH-16454 (Unhandled INF in date_sunset() with tiny $utcOffset).
(cmb)
- DBA:
. Fixed bug GH-16390 (dba_open() can segfault for "pathless" streams). (cmb)
- DOM:
. Fixed bug GH-16316 (DOMXPath breaks when not initialized properly).
(nielsdos)

15
ext/dba/dba.c
View File

@@ -844,10 +844,13 @@ restart:
connection->info->lock.fp = php_stream_open_wrapper(lock_name, lock_file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|persistent_flag, &opened_path);
if (connection->info->lock.fp) {
if (is_db_lock) {
ZEND_ASSERT(opened_path);
/* replace the path info with the real path of the opened file */
zend_string_release_ex(connection->info->path, persistent);
connection->info->path = php_dba_zend_string_dup_safe(opened_path, persistent);
if (opened_path) {
/* replace the path info with the real path of the opened file */
zend_string_release_ex(connection->info->path, persistent);
connection->info->path = php_dba_zend_string_dup_safe(opened_path, persistent);
} else {
error = "Unable to determine path for locking";
}
}
}
if (opened_path) {
@@ -864,10 +867,10 @@ restart:
zval_ptr_dtor(return_value);
RETURN_FALSE;
}
if (!php_stream_supports_lock(connection->info->lock.fp)) {
if (!error && !php_stream_supports_lock(connection->info->lock.fp)) {
error = "Stream does not support locking";
}
if (php_stream_lock(connection->info->lock.fp, lock_mode)) {
if (!error && php_stream_lock(connection->info->lock.fp, lock_mode)) {
error = "Unable to establish lock"; /* force failure exit */
}
}

11
ext/dba/tests/gh16390.phpt Normal file
View File

@@ -0,0 +1,11 @@
--TEST--
GH-16390 (dba_open() can segfault for "pathless" streams)
--EXTENSIONS--
dba
--FILE--
<?php
$file = 'data:text/plain;z=y;uri=eviluri;mediatype=wut?;mediatype2=hello,somedata';
$db = dba_open($file, 'c', 'inifile');
?>
--EXPECTF--
Warning: dba_open(): Driver initialization failed for handler: inifile: Unable to determine path for locking in %s on line %d