iliaa Sun Nov 20 15:07:40 2005 EDT
Modified files:
/php-src/ext/pdo pdo_dbh.c
Log:
MFB51: Fixed bug #35303 (PDO prepare() crashes with invalid parameters).
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.100&r2=1.101&ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.100 php-src/ext/pdo/pdo_dbh.c:1.101
--- php-src/ext/pdo/pdo_dbh.c:1.100 Sat Nov 19 11:39:47 2005
+++ php-src/ext/pdo/pdo_dbh.c Sun Nov 20 15:07:38 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.100 2005/11/19 16:39:47 tony2001 Exp $ */
+/* $Id: pdo_dbh.c,v 1.101 2005/11/20 20:07:38 iliaa Exp $ */
/* The PDO Database Handle Class */
@@ -508,7 +508,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
|| !PDO_ZVAL_PP_IS_TEXT(item)
|| zend_u_lookup_class(Z_TYPE_PP(item),
Z_UNIVAL_PP(item), Z_UNILEN_PP(item), &pce TSRMLS_CC) == FAILURE
) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
