]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Sat, 1 Nov 2014 18:21:38 +0000 (19:21 +0100)
committerMatteo Beccati <mbeccati@php.net>
Sat, 1 Nov 2014 18:21:38 +0000 (19:21 +0100)
* PHP-5.6:
  Fixed bug #66584 Segmentation fault on statement deallocation

1  2 
ext/pdo_pgsql/pgsql_statement.c

index 05b8f79b27b0f58199aa1dd675a22aef3e48e699,7da130d52b00fac0cab24372b35ec6eede52d26d..9e8fc746fa98d7cfdaa8c1700b567b04f2f1e003
@@@ -299,9 -297,7 +299,9 @@@ static int pgsql_stmt_param_hook(pdo_st
                                                        sizeof(Oid));
                                }
                                if (param->paramno >= 0) {
-                                       if (param->paramno > zend_hash_num_elements(stmt->bound_param_map)) {
 +                                      zval *parameter;
 +
+                                       if (param->paramno >= zend_hash_num_elements(stmt->bound_param_map)) {
                                                pdo_pgsql_error_stmt(stmt, PGRES_FATAL_ERROR, "HY105");
                                                return 0;
                                        }