Skip to content

ext/pdo: Fixed memory leak of setFetchMode() #16703

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions ext/pdo/pdo_stmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -2077,6 +2077,23 @@ static zend_function *dbstmt_method_get(zend_object **object_pp, zend_string *me
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;

Expand Down Expand Up @@ -2495,6 +2512,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;
Expand Down
48 changes: 48 additions & 0 deletions ext/pdo/tests/gh16703.phpt
Original file line number Diff line number Diff line change
@@ -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!
Loading