[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c /ext/pdo_pgsql pgsql_statement.c

[Ilia Alshanetsky]

iliaa           Tue Nov 20 23:12:17 2007 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/pdo_pgsql      pgsql_statement.c 
    /php-src/ext/pdo    pdo_stmt.c 
  Log:
  
  Adjusted fix for bug #42978
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.12.2.7&r2=1.31.2.12.2.7.2.1&diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.1
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7       Tue Apr 17 
15:29:13 2007
+++ php-src/ext/pdo_pgsql/pgsql_statement.c     Tue Nov 20 23:12:17 2007
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pgsql_statement.c,v 1.31.2.12.2.7 2007/04/17 15:29:13 iliaa Exp $ */
+/* $Id: pgsql_statement.c,v 1.31.2.12.2.7.2.1 2007/11/20 23:12:17 iliaa Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -265,6 +265,11 @@
                                                        sizeof(Oid));
                                }
                                if (param->paramno >= 0) {
+                                       if (param->paramno > 
zend_hash_num_elements(stmt->bound_param_map)) {
+                                               pdo_pgsql_error_stmt(stmt, 
PGRES_FATAL_ERROR, "HY105");
+                                               return 0;
+                                       }
+
                                        if (PDO_PARAM_TYPE(param->param_type) 
== PDO_PARAM_LOB &&
                                                        
Z_TYPE_P(param->parameter) == IS_RESOURCE) {
                                                php_stream *stm;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.6&r2=1.118.2.38.2.24.2.7&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.6 
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.7
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.6      Tue Nov 20 14:22:27 2007
+++ php-src/ext/pdo/pdo_stmt.c  Tue Nov 20 23:12:17 2007
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.6 2007/11/20 14:22:27 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.7 2007/11/20 23:12:17 iliaa Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -168,11 +168,6 @@
 
 iterate:
        if (ht) {
-               if (zend_hash_num_elements(stmt->bound_param_map) != 
zend_hash_num_elements(ht)) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of 
bound paramters %d does not match number of bound values %d", 
zend_hash_num_elements(stmt->bound_param_map), zend_hash_num_elements(ht));
-                       return 0;       
-               }
-
                zend_hash_internal_pointer_reset(ht);
                while (SUCCESS == zend_hash_get_current_data(ht, 
(void**)&param)) {
                        if (!stmt->methods->param_hook(stmt, param, event_type 
TSRMLS_CC)) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php