com php-src: Fixed PDO constructor to not return null.: ext/pdo/pdo_dbh.c
| From: | Dmitry Stogov | Date: | Sun, 15 Mar 2015 15:03:03 +0000 |
| Subject: | com php-src: Fixed PDO constructor to not return null.: ext/pdo/pdo_dbh.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86001@lists.php.net to get a copy of this message | ||
Commit: d3267d0092a09eb3a0da2bd953ad21cf5bae325a
Author: Danack <Danack@basereality.com> Sun, 15 Mar 2015 15:03:03 +0000
Parents: 78ebf83ad3299bdb2617da60c9be68ce2cf33fb4
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d3267d0092a09eb3a0da2bd953ad21cf5bae325a
Log:
Fixed PDO constructor to not return null.
Changed paths:
M ext/pdo/pdo_dbh.c
Diff:
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index de9a6ab..1796435 100644
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -208,9 +208,15 @@ static PHP_METHOD(PDO, dbh_constructor)
zval *options = NULL;
char alt_dsn[512];
int call_factory = 1;
+ zend_error_handling zeh;
+ int rv;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|s!s!a!", &data_source,
&data_source_len,
- &username, &usernamelen, &password, &passwordlen, &options)) {
+ zend_replace_error_handling(EH_THROW, pdo_exception_ce, &zeh TSRMLS_CC);
+ rv = zend_parse_parameters(ZEND_NUM_ARGS(), "s|s!s!a!", &data_source,
&data_source_len,
+ &username, &usernamelen, &password, &passwordlen, &options);
+ zend_restore_error_handling(&zeh TSRMLS_CC);
+
+ if (FAILURE == rv) {
ZEND_CTOR_MAKE_NULL();
return;
}