diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-09 10:10:41 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-09 10:10:41 +0200 |
| commit | 645b0372e3cdf65f060d749ad4f6dfdd7e0252fb (patch) | |
| tree | f48c5b064030a2b304e684120f0ffb0e06958c64 | |
| parent | f5dfea60a2564fe56dd321582371667dfbbd486a (diff) | |
| download | php-git-645b0372e3cdf65f060d749ad4f6dfdd7e0252fb.tar.gz | |
Fix double free of DSN credentials
| -rw-r--r-- | ext/pdo_dblib/dblib_driver.c | 4 | ||||
| -rw-r--r-- | ext/pdo_firebird/firebird_driver.c | 4 | ||||
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 4 | ||||
| -rw-r--r-- | ext/pdo_oci/oci_driver.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c index 7f2b7ebe3c..03bdaa1f48 100644 --- a/ext/pdo_dblib/dblib_driver.c +++ b/ext/pdo_dblib/dblib_driver.c @@ -522,7 +522,7 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options) } if (!dbh->username && vars[6].optval) { - dbh->username = vars[6].optval; + dbh->username = pestrdup(vars[6].optval, dbh->is_persistent); } if (dbh->username) { @@ -532,7 +532,7 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options) } if (!dbh->password && vars[7].optval) { - dbh->password = vars[7].optval; + dbh->password = pestrdrup(vars[7].optval, dbh->is_persistent); } if (dbh->password) { diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index e1b03a4601..8b2a128963 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -635,11 +635,11 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, 5); if (!dbh->username && vars[3].optval) { - dbh->username = vars[3].optval; + dbh->username = pestrdup(vars[3].optval, dbh->is_persistent); } if (!dbh->password && vars[4].optval) { - dbh->password = vars[4].optval; + dbh->password = pestrdup(vars[4].optval, dbh->is_persistent); } do { diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 6910582ba5..2f85d8dbb7 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -811,11 +811,11 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options) } if (!dbh->username && vars[5].optval) { - dbh->username = vars[5].optval; + dbh->username = pestrdup(vars[5].optval, dbh->is_persistent); } if (!dbh->password && vars[6].optval) { - dbh->password = vars[6].optval; + dbh->password = pestrdup(vars[6].optval, dbh->is_persistent); } /* TODO: - Check zval cache + ZTS */ diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c index 3ee02657c3..386789e069 100644 --- a/ext/pdo_oci/oci_driver.c +++ b/ext/pdo_oci/oci_driver.c @@ -748,7 +748,7 @@ static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{ * /* username */ if (!dbh->username && vars[2].optval) { - dbh->username = vars[2].optval; + dbh->username = pestrdup(vars[2].optval, dbh->is_persistent); } if (dbh->username) { @@ -763,7 +763,7 @@ static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{ * /* password */ if (!dbh->password && vars[3].optval) { - dbh->password = vars[3].optval; + dbh->password = pestrdup(vars[3].optval, dbh->is_persistent); } if (dbh->password) { |