com php-src: Merge branch 'PHP-5.6': ext/pdo_pgsql/pgsql_st atement.c
| From: | Matteo Beccati | Date: | Sat, 01 Nov 2014 18:21:38 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/pdo_pgsql/pgsql_st atement.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82930@lists.php.net to get a copy of this message | ||
Commit: f9a77b71e24d918981a9503d51db74c419a017ab
Author: Matteo Beccati <mbeccati@php.net> Sat, 1 Nov 2014 19:21:38 +0100
Parents: 241d73cbf9686be5240a26da126ba50513bfaece e12d69df0c013bf94b18136fe877f9af2ba15c02
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f9a77b71e24d918981a9503d51db74c419a017ab
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #66584 Segmentation fault on statement deallocation
Bugs:
https://bugs.php.net/66584
Changed paths:
MM ext/pdo_pgsql/pgsql_statement.c
Diff:
diff --cc ext/pdo_pgsql/pgsql_statement.c
index 05b8f79,7da130d..9e8fc74
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@@ -299,9 -297,7 +299,9 @@@ static int pgsql_stmt_param_hook(pdo_st
sizeof(Oid));
}
if (param->paramno >= 0) {
+ zval *parameter;
+
- if (param->paramno > zend_hash_num_elements(stmt->bound_param_map)) {
+ if (param->paramno >= zend_hash_num_elements(stmt->bound_param_map)) {
pdo_pgsql_error_stmt(stmt, PGRES_FATAL_ERROR, "HY105");
return 0;
}