pierrick Mon, 14 Dec 2009 03:44:33 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292107
Log:
- Fixed bug #50458 (PDO::FETCH_FUNC fails with Closures)
Bug: http://bugs.php.net/50458 (Open) PDO::FETCH_FUNC fails with Closures
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c
A php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_50458.phpt
U php/php-src/trunk/ext/pdo/pdo_stmt.c
A php/php-src/trunk/ext/pdo/tests/bug_50458.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-12-14 03:39:18 UTC (rev 292106)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-12-14 03:44:33 UTC (rev 292107)
@@ -35,6 +35,7 @@
- Fixed bug #50464 (declare encoding doesn't work within an included file).
(Felipe)
+- Fixed bug #50458 (PDO::FETCH_FUNC fails with Closures). (Felipe, Pierrick)
- Fixed bug #50445 (PDO-ODBC stored procedure call from Solaris 64-bit causes
seg fault). (davbrown4 at yahoo dot com, Felipe)
- Fixed bug #50351 (performance regression handling objects, ten times slower
Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c 2009-12-14 03:39:18 UTC (rev 292106)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c 2009-12-14 03:44:33 UTC (rev 292107)
@@ -784,95 +784,20 @@
static int make_callable_ex(pdo_stmt_t *stmt, zval *callable, zend_fcall_info * fci, zend_fcall_info_cache * fcc, int num_args TSRMLS_DC) /* {{{ */
{
- zval *object = NULL, **method = NULL;
- char *fname = NULL, *cname;
- zend_class_entry * ce = NULL, **pce;
- zend_function *function_handler;
-
- if (Z_TYPE_P(callable) == IS_ARRAY) {
- if (Z_ARRVAL_P(callable)->nNumOfElements < 2) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function must be a valid callback" TSRMLS_CC);
- return 0;
- }
- object = *(zval**)Z_ARRVAL_P(callable)->pListHead->pData;
- method = (zval**)Z_ARRVAL_P(callable)->pListHead->pListNext->pData;
+ char *is_callable_error = NULL;
- if (Z_TYPE_P(object) == IS_STRING) { /* static call */
- if (zend_lookup_class(Z_STRVAL_P(object), Z_STRLEN_P(object), &pce TSRMLS_CC) == FAILURE) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied class does not exist" TSRMLS_CC);
- return 0;
- } else {
- ce = *pce;
- }
- object = NULL;
- } else if (Z_TYPE_P(object) == IS_OBJECT) { /* object call */
- ce = Z_OBJCE_P(object);
+ if (zend_fcall_info_init(callable, 0, fci, fcc, NULL, &is_callable_error TSRMLS_CC) == FAILURE) {
+ if (is_callable_error) {
+ pdo_raise_impl_error(stmt->dbh, stmt, "HY000", is_callable_error TSRMLS_CC);
+ efree(is_callable_error);
} else {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function must be a valid callback; bogus object/class name" TSRMLS_CC);
- return 0;
+ pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function must be a valid callback" TSRMLS_CC);
}
-
- if (Z_TYPE_PP(method) != IS_STRING) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function must be a valid callback; bogus method name" TSRMLS_CC);
- return 0;
- }
- } else if (Z_TYPE_P(callable) == IS_STRING) {
- method = &callable;
- }
-
- if (!method || !zend_is_callable(callable, 0, &fname TSRMLS_CC)) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function must be a valid callback" TSRMLS_CC);
- if (fname) {
- efree(fname);
- }
return 0;
}
- /* ATM we do not support array($obj, "CLASS::FUNC") or "CLASS_FUNC" */
- cname = fname;
- if ((fname = strstr(fname, "::")) == NULL) {
- fname = cname;
- cname = NULL;
- } else {
- *fname = '\0';
- fname += 2;
- }
- if (cname) {
- if (zend_lookup_class(cname, strlen(cname), &pce TSRMLS_CC) == FAILURE) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied class does not exist" TSRMLS_CC);
- return 0;
- } else {
- if (ce) {
- /* pce must be base of ce or ce itself */
- if (ce != *pce && !instanceof_function(ce, *pce TSRMLS_CC)) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied class has bogus lineage" TSRMLS_CC);
- return 0;
- }
- }
- ce = *pce;
- }
- }
-
- zend_str_tolower_copy(fname, fname, strlen(fname));
- fci->function_table = ce ? &ce->function_table : EG(function_table);
- if (zend_hash_find(fci->function_table, fname, strlen(fname)+1, (void **)&function_handler) == FAILURE) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function does not exist" TSRMLS_CC);
- return 0;
- }
- efree(cname ? cname : fname);
-
- fci->size = sizeof(zend_fcall_info);
- fci->function_name = NULL;
- fci->symbol_table = NULL;
fci->param_count = num_args; /* probably less */
fci->params = safe_emalloc(sizeof(zval**), num_args, 0);
- fci->object_ptr = object;
-
- fcc->initialized = 1;
- fcc->function_handler = function_handler;
- fcc->calling_scope = EG(scope);
- fcc->called_scope = object ? Z_OBJCE_P(object) : NULL;
- fcc->object_ptr = object;
return 1;
}
@@ -1568,7 +1493,9 @@
case 3:
case 2:
stmt->fetch.func.function = arg2;
- do_fetch_func_prepare(stmt TSRMLS_CC);
+ if (do_fetch_func_prepare(stmt TSRMLS_CC) == 0) {
+ error = 1;
+ }
break;
}
break;
Added: php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_50458.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_50458.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_50458.phpt 2009-12-14 03:44:33 UTC (rev 292107)
@@ -0,0 +1,29 @@
+--TEST--
+PDO Common: Bug #50458 (PDO::FETCH_FUNC fails with Closures)
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+
+$db = PDOTest::factory();
+$db->exec("CREATE TABLE test (a VARCHAR(10))");
+$db->exec("INSERT INTO test (a) VALUES ('xyz')");
+$res = $db->query("SELECT a FROM test");
+var_dump($res->fetchAll(PDO::FETCH_FUNC, function($a) { return strtoupper($a); }));
+
+?>
+===DONE===
+--EXPECTF--
+array(1) {
+ [0]=>
+ string(3) "XYZ"
+}
+===DONE===
Modified: php/php-src/trunk/ext/pdo/pdo_stmt.c
===================================================================
--- php/php-src/trunk/ext/pdo/pdo_stmt.c 2009-12-14 03:39:18 UTC (rev 292106)
+++ php/php-src/trunk/ext/pdo/pdo_stmt.c 2009-12-14 03:44:33 UTC (rev 292107)
@@ -783,93 +783,21 @@
static int make_callable_ex(pdo_stmt_t *stmt, zval *callable, zend_fcall_info * fci, zend_fcall_info_cache * fcc, int num_args TSRMLS_DC) /* {{{ */
{
- zval *object = NULL, **method = NULL;
- char *fname = NULL, *cname;
- zend_class_entry * ce = NULL, **pce;
- zend_function *function_handler;
-
- if (Z_TYPE_P(callable) == IS_ARRAY) {
- if (Z_ARRVAL_P(callable)->nNumOfElements < 2) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function must be a valid callback" TSRMLS_CC);
- return 0;
- }
- object = *(zval**)Z_ARRVAL_P(callable)->pListHead->pData;
- method = (zval**)Z_ARRVAL_P(callable)->pListHead->pListNext->pData;
+ char *is_callable_error = NULL;
- if (Z_TYPE_P(object) == IS_STRING) { /* static call */
- if (zend_lookup_class(Z_STRVAL_P(object), Z_STRLEN_P(object), &pce TSRMLS_CC) == FAILURE) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied class does not exist" TSRMLS_CC);
- return 0;
- } else {
- ce = *pce;
- }
- object = NULL;
- } else if (Z_TYPE_P(object) == IS_OBJECT) { /* object call */
- ce = Z_OBJCE_P(object);
+ if (zend_fcall_info_init(callable, 0, fci, fcc, NULL, &is_callable_error TSRMLS_CC) == FAILURE) {
+ if (is_callable_error) {
+ pdo_raise_impl_error(stmt->dbh, stmt, "HY000", is_callable_error TSRMLS_CC);
+ efree(is_callable_error);
} else {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function must be a valid callback; bogus object/class name" TSRMLS_CC);
- return 0;
+ pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function must be a valid callback" TSRMLS_CC);
}
-
- if (Z_TYPE_PP(method) != IS_STRING) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function must be a valid callback; bogus method name" TSRMLS_CC);
- return 0;
- }
- } else if (Z_TYPE_P(callable) == IS_STRING) {
- method = &callable;
- }
-
- if (!method || !zend_is_callable(callable, 0, NULL TSRMLS_CC)) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function must be a valid callback" TSRMLS_CC);
return 0;
}
-
- /* ATM we do not support array($obj, "CLASS::FUNC") or "CLASS_FUNC" */
- cname = fname;
- if ((fname = strstr(fname, "::")) == NULL) {
- fname = cname;
- cname = NULL;
- } else {
- *fname = '\0';
- fname += 2;
- }
- if (cname) {
- if (zend_lookup_class(cname, strlen(cname), &pce TSRMLS_CC) == FAILURE) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied class does not exist" TSRMLS_CC);
- return 0;
- } else {
- if (ce) {
- /* pce must be base of ce or ce itself */
- if (ce != *pce && !instanceof_function(ce, *pce TSRMLS_CC)) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied class has bogus lineage" TSRMLS_CC);
- return 0;
- }
- }
- ce = *pce;
- }
- }
- zend_str_tolower_copy(fname, fname, strlen(fname));
- fci->function_table = ce ? &ce->function_table : EG(function_table);
- if (zend_hash_find(fci->function_table, fname, strlen(fname)+1, (void **)&function_handler) == FAILURE) {
- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied function does not exist" TSRMLS_CC);
- return 0;
- }
- efree(cname ? cname : fname);
-
- fci->size = sizeof(zend_fcall_info);
- fci->function_name = NULL;
- fci->symbol_table = NULL;
fci->param_count = num_args; /* probably less */
fci->params = safe_emalloc(sizeof(zval**), num_args, 0);
- fci->object_ptr = object;
- fcc->initialized = 1;
- fcc->function_handler = function_handler;
- fcc->calling_scope = EG(scope);
- fcc->called_scope = object ? Z_OBJCE_P(object) : NULL;
- fcc->object_ptr = object;
-
return 1;
}
/* }}} */
@@ -1574,7 +1502,9 @@
case 3:
case 2:
stmt->fetch.func.function = arg2;
- do_fetch_func_prepare(stmt TSRMLS_CC);
+ if (do_fetch_func_prepare(stmt TSRMLS_CC) == 0) {
+ error = 1;
+ }
break;
}
break;
Added: php/php-src/trunk/ext/pdo/tests/bug_50458.phpt
===================================================================
--- php/php-src/trunk/ext/pdo/tests/bug_50458.phpt (rev 0)
+++ php/php-src/trunk/ext/pdo/tests/bug_50458.phpt 2009-12-14 03:44:33 UTC (rev 292107)
@@ -0,0 +1,29 @@
+--TEST--
+PDO Common: Bug #50458 (PDO::FETCH_FUNC fails with Closures)
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+
+$db = PDOTest::factory();
+$db->exec("CREATE TABLE test (a VARCHAR(10))");
+$db->exec("INSERT INTO test (a) VALUES ('xyz')");
+$res = $db->query("SELECT a FROM test");
+var_dump($res->fetchAll(PDO::FETCH_FUNC, function($a) { return strtoupper($a); }));
+
+?>
+===DONE===
+--EXPECTF--
+array(1) {
+ [0]=>
+ string(3) "XYZ"
+}
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
