iliaa Mon Oct 10 10:44:17 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo pdo_stmt.c
/php-src NEWS
Log:
MFH: Fixed bug #34809 (FETCH_INTO in PDO crashes without a destination
object).
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.7&r2=1.118.2.8&ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.7
php-src/ext/pdo/pdo_stmt.c:1.118.2.8
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.7 Wed Sep 21 18:58:39 2005
+++ php-src/ext/pdo/pdo_stmt.c Mon Oct 10 10:44:16 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.7 2005/09/21 22:58:39 helly Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.8 2005/10/10 14:44:16 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -830,6 +830,12 @@
break;
case PDO_FETCH_INTO:
+ if (!stmt->fetch.into) {
+ pdo_raise_impl_error(stmt->dbh, stmt,
"HY000", "No fetch-into object specified." TSRMLS_CC);
+ return 0;
+ break;
+ }
+
Z_TYPE_P(return_value) = IS_OBJECT;
Z_OBJ_HANDLE_P(return_value) =
Z_OBJ_HANDLE_P(stmt->fetch.into);
Z_OBJ_HT_P(return_value) =
Z_OBJ_HT_P(stmt->fetch.into);
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.112&r2=1.2027.2.113&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.112 php-src/NEWS:1.2027.2.113
--- php-src/NEWS:1.2027.2.112 Mon Oct 10 10:31:21 2005
+++ php-src/NEWS Mon Oct 10 10:44:16 2005
@@ -45,6 +45,8 @@
(Andrey)
- Fixed bug #34810 (mysqli::init() and others use wrong $this pointer
without checks). (Tony)
+- Fixed bug #34809 (FETCH_INTO in PDO crashes without a destination object).
+ (Ilia)
- Fixed bug #34802 (Fixed crash on object instantiation failure). (Ilia)
- Fixed bug #34796 (missing SSL linking in ext/ftp when configured as shared).
(Jani)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
