allow static linkage.

Avoid segv when no username is passed

diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
index ec030e7c1fbd0de2f8fd617995842bdd878c93bc..ff78b48171bf92ad164ba36fd7999fcd0c4164d6 100755 (executable)
--- a/ext/pdo_odbc/config.m4
+++ b/ext/pdo_odbc/config.m4
@@ -130,7 +130,7 @@ functions required for PDO support.
   PHP_EVAL_LIBLINE($PDO_ODBC_LIBS $PDO_ODBC_LFLAGS, [PDO_ODBC_SHARED_LIBADD])
   PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
 
-  PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, yes,,-I\$prefix/include/php/ext $PDO_ODBC_INCLUDE)
+  PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I\$prefix/include/php/ext $PDO_ODBC_INCLUDE)
 else
   AC_MSG_ERROR(
 Unknown ODBC flavour $PHP_PDO_ODBC

diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
index cdd55223f19b58409f50c7ef2c54b31b6a4fd54b..ced91d6fbbdeced2376e72149752fb859fbd98e1 100755 (executable)
--- a/ext/pdo_odbc/odbc_driver.c
+++ b/ext/pdo_odbc/odbc_driver.c
@@ -334,7 +334,8 @@ static int pdo_odbc_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_D
                use_direct = 1;
 
                /* Force UID and PWD to be set in the DSN */
-               if (*dbh->username && !strstr(dbh->data_source, "uid") && !strstr(dbh->data_source, "UID")) {
+               if (dbh->username && *dbh->username && !strstr(dbh->data_source, "uid")
+                               && !strstr(dbh->data_source, "UID")) {
                        char *dsn = pemalloc(strlen(dbh->data_source) + strlen(dbh->username) + strlen(dbh->password) + sizeof(";UID=;PWD="), dbh->is_persistent);
                        sprintf(dsn, "%s;UID=%s;PWD=%s", dbh->data_source, dbh->username, dbh->password);
                        pefree((char*)dbh->data_source, dbh->is_persistent);