tony2001 Sun Nov 27 16:01:02 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/pdo pdo_stmt.c
Log:
MFH: fix #35430 (PDO crashes on incorrect FETCH_FUNC use)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.235&r2=1.2027.2.236&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.235 php-src/NEWS:1.2027.2.236
--- php-src/NEWS:1.2027.2.235 Sun Nov 27 11:33:18 2005
+++ php-src/NEWS Sun Nov 27 16:01:00 2005
@@ -1,5 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 200?, PHP 5.1.2
+- Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony)
+
28 Nov 2005, PHP 5.1.1
- Disabled native date class to prevent pear::date conflict. (Ilia)
- Changed reflection constants be both PHP and class constants. (Johannes)
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.21&r2=1.118.2.22&ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.21
php-src/ext/pdo/pdo_stmt.c:1.118.2.22
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.21 Sat Nov 26 16:20:52 2005
+++ php-src/ext/pdo/pdo_stmt.c Sun Nov 27 16:01:02 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.21 2005/11/26 21:20:52 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.22 2005/11/27 21:01:02 tony2001 Exp $ */
/* The PDO Statement Handle Class */
@@ -1353,13 +1353,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
