feedback

Author: devnexen

ext/pdo/pdo_stmt.c

@@ -271,14 +271,9 @@ static bool really_register_bound_param(struct pdo_bound_param_data *param, pdo_
 	}
 
 	if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_STR && param->max_value_len <= 0 && !Z_ISNULL_P(parameter)) {
-		zend_bool is_false = (Z_TYPE_P(parameter) == IS_FALSE);
 		if (!try_convert_to_string(parameter)) {
 			return false;
 		}
-		/* the pgsql's driver does not handle empty string for false bound parameters */
-		if (is_false) {
-			ZVAL_STR(parameter, ZSTR_CHAR('0'));
-		}
 	} else if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_INT && (Z_TYPE_P(parameter) == IS_FALSE || Z_TYPE_P(parameter) == IS_TRUE)) {
 		convert_to_long(parameter);
 	} else if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_BOOL && Z_TYPE_P(parameter) == IS_LONG) {

ext/pgsql/pgsql.c

@@ -1243,7 +1243,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);
@@ -1254,6 +1254,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) {
@@ -1320,7 +1324,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();
 	}
@@ -1503,7 +1507,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();
 	}
@@ -4060,7 +4064,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();
 	}
@@ -4215,7 +4219,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();
 	}

ext/pgsql/tests/33query_params_bool.phpt

@@ -1,28 +1,33 @@
 --TEST--
-PostgreSQL prepared queries with bool constants
+PostgreSQL pg_query_params bool parameter rejection
+--EXTENSIONS--
+pgsql
 --SKIPIF--
-<?php
-include("skipif.inc");
-if (!function_exists('pg_prepare')) die('skip function pg_prepare() does not exist');
-?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 
-include('config.inc');
+include('inc/config.inc');
 
 $db = pg_connect($conn_str);
 
-$version = pg_version($db);
-if ($version['protocol'] >= 3) {
-    $result = pg_query_params($db, "SELECT * FROM ".$table_name." WHERE num >= $1;", array(true));
-    // bug occurs with false as it turns out as empty.
-    $result = pg_query_params($db, "SELECT * FROM ".$table_name." WHERE num <> $1;", array(false));
-    pg_free_result($result);
+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
-

ext/zip/php_zip.c

@@ -676,14 +676,14 @@ int php_zip_glob(zend_string *spattern, zend_long flags, zval *return_value) /*
 
 	/* now catch the FreeBSD style of "no matches" */
 	if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
-		globfree(&globbuf);
+		php_globfree(&globbuf);
 		return 0;
 	}
 
 	/* we assume that any glob pattern will match files from one directory only
 	   so checking the dirname of the first match should be sufficient */
 	if (ZIP_OPENBASEDIR_CHECKPATH(globbuf.gl_pathv[0])) {
-		globfree(&globbuf);
+		php_globfree(&globbuf);
 		return -1;
 	}