Skip to content

Fix GH-16477 (Segmentation fault when calling __debugInfo() after failed SplFileObject::__constructor) #16480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix GH-16477 (Segmentation fault when calling __debugInfo() after failed SplFileObject::__constructor) #16480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a6c3ef
Fix GH-16477 (Segmentation fault when calling __debugInfo() after fai…
Girgias Oct 17, 2024
e4b7108
Prevent dangling pointers
Girgias Oct 17, 2024
f639125
Fix review comments
Girgias Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions ext/spl/spl_directory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2042,22 +2042,21 @@ static void spl_filesystem_file_rewind(zval * this_ptr, spl_filesystem_object *i
PHP_METHOD(SplFileObject, __construct)
{
spl_filesystem_object *intern = spl_filesystem_from_obj(Z_OBJ_P(ZEND_THIS));
zend_string *file_name = NULL;
zend_string *open_mode = ZSTR_CHAR('r');
zval *stream_context = NULL;
bool use_include_path = 0;
size_t path_len;
zend_error_handling error_handling;

intern->u.file.open_mode = ZSTR_CHAR('r');

if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|Sbr!",
&intern->file_name, &open_mode,
&use_include_path, &intern->u.file.zcontext) == FAILURE) {
intern->u.file.open_mode = NULL;
intern->file_name = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|Sbr!", &file_name, &open_mode, &use_include_path, &stream_context) == FAILURE) {
RETURN_THROWS();
}

intern->u.file.open_mode = zend_string_copy(open_mode);
/* file_name and zcontext are copied by spl_filesystem_file_open() */
intern->file_name = file_name;
intern->u.file.zcontext = stream_context;

/* spl_filesystem_file_open() can generate E_WARNINGs which we want to promote to exceptions */
zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling);
Expand Down Expand Up @@ -2096,6 +2095,12 @@ PHP_METHOD(SplTempFileObject, __construct)
RETURN_THROWS();
}

/* Prevent reinitialization of Object */
if (intern->u.file.stream) {
zend_throw_error(NULL, "Cannot call constructor twice");
RETURN_THROWS();
}

if (max_memory < 0) {
file_name = zend_string_init("php://memory", sizeof("php://memory")-1, 0);
} else if (ZEND_NUM_ARGS()) {
Expand Down
19 changes: 19 additions & 0 deletions ext/spl/tests/gh16477-2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--TEST--
GH-16477-2: Memory leak when calling SplTempFileObject::__constructor() twice
--FILE--
<?php

$obj = new SplTempFileObject();

try {
$obj->__construct();
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$obj->__debugInfo();

?>
DONE
--EXPECT--
Error: Cannot call constructor twice
DONE
19 changes: 19 additions & 0 deletions ext/spl/tests/gh16477.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--TEST--
GH-16477: Segmentation fault when calling __debugInfo() after failed SplFileObject::__constructor
--FILE--
<?php

$obj = new SplFileObject(__FILE__);

try {
$obj->__construct();
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$obj->__debugInfo();

?>
DONE
--EXPECT--
ArgumentCountError: SplFileObject::__construct() expects at least 1 argument, 0 given
DONE
Loading