diff options
| author | Damien Regad <dregad@mantisbt.org> | 2015-12-20 11:21:13 +0100 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2015-12-20 18:23:32 +0100 |
| commit | 745a02a7533b744c1a14a8bb0b41fea96c41ac14 (patch) | |
| tree | 12462797042d381255077c14fd6e6b71d0b3662f | |
| parent | dcbe478834b607f0f572b934fbc1b4e137688a7f (diff) | |
| download | adodb-745a02a7533b744c1a14a8bb0b41fea96c41ac14.tar.gz adodb-745a02a7533b744c1a14a8bb0b41fea96c41ac14.tar.bz2 adodb-745a02a7533b744c1a14a8bb0b41fea96c41ac14.zip | |
mssql: avoid error when closing RS from destructor
Fix #170
| -rw-r--r-- | drivers/adodb-mssql.inc.php | 9 | ||||
| -rw-r--r-- | drivers/adodb-mssqlnative.inc.php | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/drivers/adodb-mssql.inc.php b/drivers/adodb-mssql.inc.php index a5ea6b90..f3012fec 100644 --- a/drivers/adodb-mssql.inc.php +++ b/drivers/adodb-mssql.inc.php @@ -1051,10 +1051,13 @@ class ADORecordset_mssql extends ADORecordSet { function _close() { - $rez = mssql_free_result($this->_queryID); - $this->_queryID = false; - return $rez; + if($this->_queryID) { + $this->_queryID = false; + return mssql_free_result($this->_queryID); + } + return true; } + // mssql uses a default date like Dec 30 2000 12:00AM static function UnixDate($v) { diff --git a/drivers/adodb-mssqlnative.inc.php b/drivers/adodb-mssqlnative.inc.php index ae5a1121..d5af02a3 100644 --- a/drivers/adodb-mssqlnative.inc.php +++ b/drivers/adodb-mssqlnative.inc.php @@ -1074,7 +1074,9 @@ class ADORecordset_mssqlnative extends ADORecordSet { is running. All associated result memory for the specified result identifier will automatically be freed. */ function _close() { - $rez = sqlsrv_free_stmt($this->_queryID); + if($this->_queryID) { + $rez = sqlsrv_free_stmt($this->_queryID); + } $this->_queryID = false; return $rez; } |