Safer way of allowing 'blank' user/pass.

# Thanks Wez.

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 12d2a0739424ee0ec251b13950dbf777f5db29cd..336d620e704c9d89e50adb3c88af9ba867f21df0 100755 (executable)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -220,7 +220,7 @@ static PHP_FUNCTION(dbh_constructor)
        char alt_dsn[512];
        int call_factory = 1;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ssa!", &data_source, &data_source_len,
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!s!a!", &data_source, &data_source_len,
                                &username, &usernamelen, &password, &passwordlen, &options)) {
                ZVAL_NULL(object);
                return;
@@ -357,12 +357,12 @@ static PHP_FUNCTION(dbh_constructor)
        
        dbh->data_source_len = strlen(colon + 1);
        dbh->data_source = (const char*)pestrdup(colon + 1, is_persistent);
-       dbh->username = usernamelen ? pestrdup(username, is_persistent) : NULL;
-       dbh->password = passwordlen ? pestrdup(password, is_persistent) : NULL;
+       dbh->username = username ? pestrdup(username, is_persistent) : NULL;
+       dbh->password = password ? pestrdup(password, is_persistent) : NULL;
 
        dbh->auto_commit = pdo_attr_lval(options, PDO_ATTR_AUTOCOMMIT, 1 TSRMLS_CC);
 
-       if (!dbh->data_source || (usernamelen && !dbh->username) || (passwordlen && !dbh->password)) {
+       if (!dbh->data_source || (username && !dbh->username) || (password && !dbh->password)) {
                php_error_docref(NULL TSRMLS_CC, E_ERROR, "out of memory");
        }
 

diff --git a/ext/pdo/tests/pdo_test.inc b/ext/pdo/tests/pdo_test.inc
index e941dc35cedaab269f525d466e6958dcd9da5f47..13ab1c1d5f0cf0979d3dc050b735d86ecf7fc94f 100644 (file)
--- a/ext/pdo/tests/pdo_test.inc
+++ b/ext/pdo/tests/pdo_test.inc
@@ -14,6 +14,9 @@ class PDOTest {
                } else {
                        $attr = null;
                }
+
+               if ($user === false) $user = NULL;
+               if ($pass === false) $pass = NULL;
                
                $db = new $classname($dsn, $user, $pass, $attr);