iliaa Sun Nov 20 15:06:28 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/pdo pdo_dbh.c
Log:
Fixed bug #35303 (PDO prepare() crashes with invalid parameters).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.210&r2=1.2027.2.211&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.210 php-src/NEWS:1.2027.2.211
--- php-src/NEWS:1.2027.2.210 Sun Nov 20 13:07:28 2005
+++ php-src/NEWS Sun Nov 20 15:06:26 2005
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Nov 2005, PHP 5.1
+- Fixed bug #35303 (PDO prepare() crashes with invalid parameters). (Ilia)
- Fixed bug #35293 (PDO segfaults when using persistent connections). (Tony)
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.14&r2=1.82.2.15&ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.14 php-src/ext/pdo/pdo_dbh.c:1.82.2.15
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.14 Sat Nov 19 11:41:08 2005
+++ php-src/ext/pdo/pdo_dbh.c Sun Nov 20 15:06:28 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.14 2005/11/19 16:41:08 tony2001 Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.15 2005/11/20 20:06:28 iliaa Exp $ */
/* The PDO Database Handle Class */
@@ -503,7 +503,7 @@
PDO_CONSTRUCT_CHECK;
if (ZEND_NUM_ARGS() > 1 && SUCCESS ==
zend_hash_index_find(Z_ARRVAL_P(options), PDO_ATTR_STATEMENT_CLASS,
(void**)&opt)) {
- if (zend_hash_index_find(Z_ARRVAL_PP(opt), 0, (void**)&item) ==
FAILURE
+ if (Z_TYPE_PP(opt) != IS_ARRAY ||
zend_hash_index_find(Z_ARRVAL_PP(opt), 0, (void**)&item) == FAILURE
|| Z_TYPE_PP(item) != IS_STRING
|| zend_lookup_class(Z_STRVAL_PP(item),
Z_STRLEN_PP(item), &pce TSRMLS_CC) == FAILURE
) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
