wez Sun Nov 27 16:01:59 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo pdo_stmt.c
Log:
Fix #35431; LAZY fetch and fetchAll == crash.
Lazy makes no sense with fetchAll; disallow it.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.22&r2=1.118.2.23&ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.22
php-src/ext/pdo/pdo_stmt.c:1.118.2.23
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.22 Sun Nov 27 16:01:02 2005
+++ php-src/ext/pdo/pdo_stmt.c Sun Nov 27 16:01:58 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.22 2005/11/27 21:01:02 tony2001 Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.23 2005/11/27 21:01:58 wez Exp $ */
/* The PDO Statement Handle Class */
@@ -1138,6 +1138,13 @@
return 0;
}
return 1;
+
+ case PDO_FETCH_LAZY:
+ if (fetch_all) {
+ pdo_raise_impl_error(stmt->dbh, stmt, "HY000",
"PDO::FETCH_LAZY can't be used with PDOStatement::fetchAll()" TSRMLS_CC);
+ return 0;
+ }
+ /* fall through */
default:
if ((flags & PDO_FETCH_SERIALIZE) == PDO_FETCH_SERIALIZE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
