Skip to content

pgsql ext: pg_query_params/pg_send_query_params false constant handli… #7651

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

Open
devnexen wants to merge 3 commits into
base: master
Choose a base branch
from
+42 −5
Open

pgsql ext: pg_query_params/pg_send_query_params false constant handli… #7651

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
a9ab01f
pgsql ext: pg_query_params/pg_send_query_params false constant handli…
devnexen Nov 14, 2021
81967a2
pdo update
devnexen Apr 1, 2022
ad95c4b
feedback
devnexen Apr 12, 2026
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
14 changes: 9 additions & 5 deletions ext/pgsql/pgsql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@ static void _php_pgsql_free_params(char **params, uint32_t num_params)
efree(params);
}

static char **php_pgsql_make_arguments(const HashTable *param_arr, int *num_params)
static char **php_pgsql_make_arguments(const HashTable *param_arr, int *num_params, uint32_t arg_num)
{
/* This conversion is safe because of the limit of number of elements in a table. */
*num_params = (int) zend_hash_num_elements(param_arr);
Expand All @@ -1252,6 +1252,10 @@ static char **php_pgsql_make_arguments(const HashTable *param_arr, int *num_para
ZVAL_DEREF(tmp);
if (Z_TYPE_P(tmp) == IS_NULL) {
params[i] = NULL;
} else if (Z_TYPE_P(tmp) == IS_TRUE || Z_TYPE_P(tmp) == IS_FALSE) {
zend_argument_value_error(arg_num, "must not contain boolean values, use a string representation instead");
_php_pgsql_free_params(params, i);
return NULL;
} else {
zend_string *param_str = zval_try_get_string(tmp);
if (!param_str) {
Expand Down Expand Up @@ -1318,7 +1322,7 @@ PHP_FUNCTION(pg_query_params)
php_error_docref(NULL, E_NOTICE, "Found results on this connection. Use pg_get_result() to get these results first");
}

params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params);
params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params, ZEND_NUM_ARGS());
if (UNEXPECTED(!params)) {
RETURN_THROWS();
}
Expand Down Expand Up @@ -1501,7 +1505,7 @@ PHP_FUNCTION(pg_execute)
php_error_docref(NULL, E_NOTICE, "Found results on this connection. Use pg_get_result() to get these results first");
}

params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params);
params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params, ZEND_NUM_ARGS());
if (UNEXPECTED(!params)) {
RETURN_THROWS();
}
Expand Down Expand Up @@ -4058,7 +4062,7 @@ PHP_FUNCTION(pg_send_query_params)
"There are results on this connection. Call pg_get_result() until it returns FALSE");
}

params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params);
params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params, 3);
if (UNEXPECTED(!params)) {
RETURN_THROWS();
}
Expand Down Expand Up @@ -4213,7 +4217,7 @@ PHP_FUNCTION(pg_send_execute)
"There are results on this connection. Call pg_get_result() until it returns FALSE");
}

params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params);
params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params, 3);
if (UNEXPECTED(!params)) {
RETURN_THROWS();
}
Expand Down
33 changes: 33 additions & 0 deletions ext/pgsql/tests/33query_params_bool.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--TEST--
PostgreSQL pg_query_params bool parameter rejection
--EXTENSIONS--
pgsql
--SKIPIF--
<?php include("inc/skipif.inc"); ?>
--FILE--
<?php

include('inc/config.inc');

$db = pg_connect($conn_str);

try {
pg_query_params($db, "SELECT * FROM ".$table_name." WHERE num >= $1;", array(true));
} catch (ValueError $e) {
echo $e->getMessage() . "\n";
}

try {
pg_query_params($db, "SELECT * FROM ".$table_name." WHERE num <> $1;", array(false));
} catch (ValueError $e) {
echo $e->getMessage() . "\n";
}

pg_close($db);

echo "OK";
?>
--EXPECT--
pg_query_params(): Argument #3 ($params) must not contain boolean values, use a string representation instead
pg_query_params(): Argument #3 ($params) must not contain boolean values, use a string representation instead
OK
Loading