mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 01:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Added gc_handler to properly handle circular references. (#16703)
This commit is contained in:
Saki Takamachi 2024-11-06 20:32:53 +09:00
commit 74218530b6
No known key found for this signature in database
GPG Key ID: 770426E17EBBB3DD
2 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ext/pdo/pdo_stmt.c
View File

@ -2066,6 +2066,23 @@ out:
return fbc;
}
static HashTable *dbstmt_get_gc(zend_object *object, zval **gc_data, int *gc_count)
{
pdo_stmt_t *stmt = php_pdo_stmt_fetch_object(object);
*gc_data = &stmt->fetch.into;
*gc_count = 1;
/**
* If there are no dynamic properties and the default property is 1 (that is, there is only one property
* of string that does not participate in GC), there is no need to call zend_std_get_properties().
*/
if (object->properties == NULL && object->ce->default_properties_count <= 1) {
return NULL;
} else {
return zend_std_get_properties(object);
}
}
zend_object_handlers pdo_dbstmt_object_handlers;
zend_object_handlers pdo_row_object_handlers;
@ -2483,6 +2500,7 @@ void pdo_stmt_init(void)
pdo_dbstmt_object_handlers.get_method = dbstmt_method_get;
pdo_dbstmt_object_handlers.compare = zend_objects_not_comparable;
pdo_dbstmt_object_handlers.clone_obj = NULL;
pdo_dbstmt_object_handlers.get_gc = dbstmt_get_gc;
pdo_row_ce = register_class_PDORow();
pdo_row_ce->create_object = pdo_row_new;

48
ext/pdo/tests/gh16703.phpt Normal file
View File

@ -0,0 +1,48 @@
--TEST--
GH-16703: Memory leak of setFetchMode()
--EXTENSIONS--
pdo
--SKIPIF--
<?php
$dir = getenv('REDIR_TEST_DIR');
if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
PDOTest::skip();
?>
--FILE--
<?php
if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
class TestStmt extends PDOStatement
{
public $name;
}
$db = new PDO(
getenv('PDOTEST_DSN'),
getenv('PDOTEST_USER') ?: null,
getenv('PDOTEST_PASS') ?: null,
[
PDO::ATTR_CASE => PDO::CASE_LOWER,
PDO::ATTR_STATEMENT_CLASS => [TestStmt::class],
],
);
$db->exec('CREATE TABLE gh16703 (name varchar(255))');
$db->exec("INSERT INTO gh16703 (name) VALUES ('test_name')");
$stmt = $db->query('SELECT name FROM gh16703');
$t = $stmt;
$stmt->setFetchMode(PDO::FETCH_INTO, $stmt);
$stmt->fetch();
echo "done!\n";
?>
--CLEAN--
<?php
if (getenv('PDOTEST_DSN') === 'sqlite::memory:') return;
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
$db->exec('DROP TABLE gh16703');
?>
--EXPECT--
done!