Skip to content

Convert PDO Statement constructor arguments to HashTable* #9725

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 1 commit into from
Closed

Convert PDO Statement constructor arguments to HashTable* #9725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 38 additions & 27 deletions ext/pdo/pdo_stmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,13 +633,15 @@ static bool do_fetch_class_prepare(pdo_stmt_t *stmt) /* {{{ */
fci->retval = &stmt->fetch.cls.retval;
fci->param_count = 0;
fci->params = NULL;
fci->named_params = stmt->fetch.cls.ctor_args;

zend_fcall_info_args_ex(fci, ce->constructor, &stmt->fetch.cls.ctor_args);
// TODO Should we really wrap arguments that are meant to be passed by reference back to userland functions? */
//zend_fcall_info_args_ex(fci, ce->constructor, &);

fcc->function_handler = ce->constructor;
fcc->called_scope = ce;
return 1;
} else if (!Z_ISUNDEF(stmt->fetch.cls.ctor_args)) {
} else if (stmt->fetch.cls.ctor_args) {
zend_throw_error(NULL, "User-supplied statement does not accept constructor arguments");
return 0;
} else {
Expand Down Expand Up @@ -687,24 +689,29 @@ static bool do_fetch_func_prepare(pdo_stmt_t *stmt) /* {{{ */
}
/* }}} */

static void do_fetch_opt_finish(pdo_stmt_t *stmt, int free_ctor_agrs) /* {{{ */
static void do_fetch_opt_finish(pdo_stmt_t *stmt, bool free_ctor_agrs) /* {{{ */
{
/* fci.size is used to check if it is valid */
if (stmt->fetch.cls.fci.size && stmt->fetch.cls.fci.params) {
if (!Z_ISUNDEF(stmt->fetch.cls.ctor_args)) {
if (stmt->fetch.cls.ctor_args) {
/* Added to free constructor arguments */
zend_fcall_info_args_clear(&stmt->fetch.cls.fci, 1);
zend_array_destroy(stmt->fetch.cls.ctor_args);
stmt->fetch.cls.ctor_args = NULL;
stmt->fetch.cls.fci.param_count = 0;
stmt->fetch.cls.fci.named_params = NULL;
} else {
efree(stmt->fetch.cls.fci.params);
}
stmt->fetch.cls.fci.params = NULL;
}

stmt->fetch.cls.fci.size = 0;
if (!Z_ISUNDEF(stmt->fetch.cls.ctor_args) && free_ctor_agrs) {
zval_ptr_dtor(&stmt->fetch.cls.ctor_args);
ZVAL_UNDEF(&stmt->fetch.cls.ctor_args);
if (stmt->fetch.cls.ctor_args && free_ctor_agrs) {
zend_array_destroy(stmt->fetch.cls.ctor_args);
stmt->fetch.cls.ctor_args = NULL;
stmt->fetch.cls.fci.param_count = 0;
stmt->fetch.cls.fci.named_params = NULL;
}
if (stmt->fetch.func.values) {
efree(stmt->fetch.func.values);
Expand All @@ -719,7 +726,8 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
{
int flags, idx, old_arg_count = 0;
zend_class_entry *ce = NULL, *old_ce = NULL;
zval grp_val, *pgrp, retval, old_ctor_args = {{0}, {0}, {0}};
zval grp_val, *pgrp, retval;
HashTable *old_ctor_args = NULL;
int colno;
int i = 0;

Expand Down Expand Up @@ -813,7 +821,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
zend_class_entry *cep;

old_ce = stmt->fetch.cls.ce;
ZVAL_COPY_VALUE(&old_ctor_args, &stmt->fetch.cls.ctor_args);
old_ctor_args = stmt->fetch.cls.ctor_args;
old_arg_count = stmt->fetch.cls.fci.param_count;
do_fetch_opt_finish(stmt, 0);

Expand Down Expand Up @@ -1045,7 +1053,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
if (flags & PDO_FETCH_CLASSTYPE) {
do_fetch_opt_finish(stmt, 0);
stmt->fetch.cls.ce = old_ce;
ZVAL_COPY_VALUE(&stmt->fetch.cls.ctor_args, &old_ctor_args);
stmt->fetch.cls.ctor_args = old_ctor_args;
stmt->fetch.cls.fci.param_count = old_arg_count;
}
break;
Expand Down Expand Up @@ -1181,28 +1189,28 @@ PHP_METHOD(PDOStatement, fetchObject)
{
zend_class_entry *ce = NULL;
zend_class_entry *old_ce;
zval old_ctor_args, *ctor_args = NULL;
HashTable *old_ctor_args, *ctor_args = NULL;
int old_arg_count;

ZEND_PARSE_PARAMETERS_START(0, 2)
Z_PARAM_OPTIONAL
Z_PARAM_CLASS_OR_NULL(ce)
Z_PARAM_ARRAY(ctor_args)
Z_PARAM_ARRAY_HT(ctor_args)
ZEND_PARSE_PARAMETERS_END();

PHP_STMT_GET_OBJ;
PDO_STMT_CLEAR_ERR();

old_ce = stmt->fetch.cls.ce;
ZVAL_COPY_VALUE(&old_ctor_args, &stmt->fetch.cls.ctor_args);
old_ctor_args = stmt->fetch.cls.ctor_args;
old_arg_count = stmt->fetch.cls.fci.param_count;

do_fetch_opt_finish(stmt, 0);

if (ctor_args && zend_hash_num_elements(Z_ARRVAL_P(ctor_args))) {
ZVAL_ARR(&stmt->fetch.cls.ctor_args, zend_array_dup(Z_ARRVAL_P(ctor_args)));
if (ctor_args && zend_hash_num_elements(ctor_args)) {
stmt->fetch.cls.ctor_args = zend_array_dup(ctor_args);
} else {
ZVAL_UNDEF(&stmt->fetch.cls.ctor_args);
stmt->fetch.cls.ctor_args = NULL;
}
if (ce) {
stmt->fetch.cls.ce = ce;
Expand All @@ -1217,7 +1225,7 @@ PHP_METHOD(PDOStatement, fetchObject)
do_fetch_opt_finish(stmt, 1);

stmt->fetch.cls.ce = old_ce;
ZVAL_COPY_VALUE(&stmt->fetch.cls.ctor_args, &old_ctor_args);
stmt->fetch.cls.ctor_args = old_ctor_args;
stmt->fetch.cls.fci.param_count = old_arg_count;
}
/* }}} */
Expand Down Expand Up @@ -1251,15 +1259,15 @@ PHP_METHOD(PDOStatement, fetchAll)
zval data, *return_all = NULL;
zval *arg2 = NULL;
zend_class_entry *old_ce;
zval old_ctor_args, *ctor_args = NULL;
HashTable *old_ctor_args, *ctor_args = NULL;
bool error = false;
int flags, old_arg_count;

ZEND_PARSE_PARAMETERS_START(0, 3)
Z_PARAM_OPTIONAL
Z_PARAM_LONG(how)
Z_PARAM_ZVAL_OR_NULL(arg2)
Z_PARAM_ARRAY_OR_NULL(ctor_args)
Z_PARAM_ARRAY_HT_OR_NULL(ctor_args)
ZEND_PARSE_PARAMETERS_END();

PHP_STMT_GET_OBJ;
Expand All @@ -1268,7 +1276,7 @@ PHP_METHOD(PDOStatement, fetchAll)
}

old_ce = stmt->fetch.cls.ce;
ZVAL_COPY_VALUE(&old_ctor_args, &stmt->fetch.cls.ctor_args);
old_ctor_args = stmt->fetch.cls.ctor_args;
old_arg_count = stmt->fetch.cls.fci.param_count;

do_fetch_opt_finish(stmt, 0);
Expand All @@ -1292,10 +1300,10 @@ PHP_METHOD(PDOStatement, fetchAll)
stmt->fetch.cls.ce = zend_standard_class_def;
}

if (ctor_args && zend_hash_num_elements(Z_ARRVAL_P(ctor_args)) > 0) {
ZVAL_COPY_VALUE(&stmt->fetch.cls.ctor_args, ctor_args); /* we're not going to free these */
if (ctor_args && zend_hash_num_elements(ctor_args) > 0) {
stmt->fetch.cls.ctor_args = ctor_args; /* we're not going to free these */
} else {
ZVAL_UNDEF(&stmt->fetch.cls.ctor_args);
stmt->fetch.cls.ctor_args = NULL;
}

do_fetch_class_prepare(stmt);
Expand Down Expand Up @@ -1392,7 +1400,7 @@ PHP_METHOD(PDOStatement, fetchAll)

/* Restore defaults which were changed by PDO_FETCH_CLASS mode */
stmt->fetch.cls.ce = old_ce;
ZVAL_COPY_VALUE(&stmt->fetch.cls.ctor_args, &old_ctor_args);
stmt->fetch.cls.ctor_args = old_ctor_args;
stmt->fetch.cls.fci.param_count = old_arg_count;

/* on no results, return an empty array */
Expand Down Expand Up @@ -1764,8 +1772,11 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a

case PDO_FETCH_CLASS: {
HashTable *constructor_args = NULL;
/* Undef constructor arguments */
ZVAL_UNDEF(&stmt->fetch.cls.ctor_args);
/* Free constructor arguments */
if (stmt->fetch.cls.ctor_args) {
zend_array_destroy(stmt->fetch.cls.ctor_args);
stmt->fetch.cls.ctor_args = NULL;
}
/* Gets its class name from 1st column */
if ((flags & PDO_FETCH_CLASSTYPE) == PDO_FETCH_CLASSTYPE) {
if (variadic_num_args != 0) {
Expand Down Expand Up @@ -1818,7 +1829,7 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a

/* If constructor arguments are present and not empty */
if (constructor_args) {
ZVAL_ARR(&stmt->fetch.cls.ctor_args, zend_array_dup(constructor_args));
stmt->fetch.cls.ctor_args = zend_array_dup(constructor_args);
}
}

Expand Down
8 changes: 4 additions & 4 deletions ext/pdo/php_pdo_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,17 +607,17 @@ struct _pdo_stmt_t {
union {
int column;
struct {
zval ctor_args; /* freed */
zval retval;
HashTable *ctor_args; /* freed */
zend_fcall_info fci;
zend_fcall_info_cache fcc;
zval retval;
zend_class_entry *ce;
} cls;
struct {
zval fetch_args; /* freed */
zval object;
HashTable *fetch_args; /* freed */
zend_fcall_info fci;
zend_fcall_info_cache fcc;
zval object;
zval function;
zval *values; /* freed */
} func;
Expand Down
14 changes: 10 additions & 4 deletions ext/pdo/tests/pdo_005.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,15 @@ array(3) {
string(2) "CC"
}
}

Warning: TestDerived::__construct(): Argument #1 ($row) must be passed by reference, value given in %s on line %d
TestDerived::__construct(0,1)
TestDerived::__construct(1,2)
TestDerived::__construct(2,3)

Warning: TestDerived::__construct(): Argument #1 ($row) must be passed by reference, value given in %s on line %d
TestDerived::__construct(0,2)

Warning: TestDerived::__construct(): Argument #1 ($row) must be passed by reference, value given in %s on line %d
TestDerived::__construct(0,3)
array(3) {
[0]=>
object(TestDerived)#%d (5) {
Expand All @@ -136,7 +142,7 @@ array(3) {
["val2":"TestBase":private]=>
NULL
["row":protected]=>
int(1)
int(0)
["val2"]=>
string(2) "BB"
}
Expand All @@ -149,7 +155,7 @@ array(3) {
["val2":"TestBase":private]=>
NULL
["row":protected]=>
int(2)
int(0)
["val2"]=>
string(2) "CC"
}
Expand Down