[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c

[Antony Dovgal]

tony2001                Sun Nov 27 15:56:47 2005 EDT

  Modified files:              
    /php-src/ext/pdo    pdo_stmt.c 
  Log:
  fix #35430 (PDO crashes on incorrect FETCH_FUNC use)
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.131&r2=1.132&ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.131 php-src/ext/pdo/pdo_stmt.c:1.132
--- php-src/ext/pdo/pdo_stmt.c:1.131    Thu Nov 24 11:22:27 2005
+++ php-src/ext/pdo/pdo_stmt.c  Sun Nov 27 15:56:46 2005
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_stmt.c,v 1.131 2005/11/24 16:22:27 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.132 2005/11/27 20:56:46 tony2001 Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -1305,13 +1305,15 @@
                switch(ZEND_NUM_ARGS()) {
                case 0:
                case 1:
+                       pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "no 
fetch function specified" TSRMLS_CC);
+                       error = 1;
                        break;
                case 3:
                case 2:
                        stmt->fetch.func.function = arg2;
+                       do_fetch_func_prepare(stmt TSRMLS_CC);
                        break;
                }
-               do_fetch_func_prepare(stmt TSRMLS_CC);
                break;
        
        case PDO_FETCH_COLUMN:

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