iliaa Sun Mar 19 17:35:36 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo pdo_stmt.c
Log:
Properly calculate the size of the result array.
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.33&r2=1.118.2.34&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.33
php-src/ext/pdo/pdo_stmt.c:1.118.2.34
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.33 Sat Mar 18 22:24:05 2006
+++ php-src/ext/pdo/pdo_stmt.c Sun Mar 19 17:35:36 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.33 2006/03/18 22:24:05 tony2001 Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.34 2006/03/19 17:35:36 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -833,7 +833,13 @@
case PDO_FETCH_BOTH:
case PDO_FETCH_NUM:
case PDO_FETCH_NAMED:
- array_init(return_value);
+ if (!return_all) {
+ ALLOC_HASHTABLE(return_value->value.ht);
+ zend_hash_init(return_value->value.ht,
stmt->column_count, NULL, ZVAL_PTR_DTOR, 0);
+ Z_TYPE_P(return_value) = IS_ARRAY;
+ } else {
+ array_init(return_value);
+ }
break;
case PDO_FETCH_COLUMN:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
