diff options
| author | Matthew J. Francis <mjay.francis@gmail.com> | 2014-09-20 12:14:41 +0800 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-09-22 05:15:53 +0000 |
| commit | 764e3016b62665281539af4e990ca4ff0445c26c (patch) | |
| tree | f5ec6b10fa76e3f622d26095981e5c1a92c2485f /connectivity/workben | |
| parent | werror: ‘nDirection’ shadows a member of 'this' (diff) | |
| download | core-764e3016b62665281539af4e990ca4ff0445c26c.tar.gz core-764e3016b62665281539af4e990ca4ff0445c26c.zip | |
fdo#84086 Fix assorted use-after-free bugs
Change-Id: Iec004fffdb0afbe27bd69f379db90f6d904a8a65
Reviewed-on: https://gerrit.libreoffice.org/11553
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'connectivity/workben')
| -rw-r--r-- | connectivity/workben/testmoz/main.cxx | 6 | ||||
| -rw-r--r-- | connectivity/workben/testmoz/mozthread.cxx | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index 7051ef2e28d4..0b49ea3e2596 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -82,8 +82,7 @@ void printColumns( Reference<XResultSet> &xRes ) printf( "ColumnCount = %d\n", xMeta->getColumnCount()); for(sal_Int32 i=1;i<=xMeta->getColumnCount();++i) { - const char *str = OUtoCStr(xMeta->getColumnName(i)); - printf( aPat, str ); + printf( aPat, OUtoCStr(xMeta->getColumnName(i) ); } printf("\n"); printf("------------------------------------------------------------------------------------------\n"); @@ -100,8 +99,7 @@ void printXResultSet( Reference<XResultSet> &xRes ) for(sal_Int32 j=1;j<=xMeta->getColumnCount();++j) { try { - const char *str = OUtoCStr(xRow->getString(j)); - printf( aPat_Short, str ); + printf( aPat_Short, OUtoCStr(xRow->getString(j)) ); } catch (...) { printf(" Ex "); } diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx index 48ab7b1f68eb..527d2f34373a 100644 --- a/connectivity/workben/testmoz/mozthread.cxx +++ b/connectivity/workben/testmoz/mozthread.cxx @@ -102,8 +102,7 @@ void printColumns( Reference<XResultSet> &xRes ) OSL_TRACE( "ColumnCount = %d", xMeta->getColumnCount()); for(sal_Int32 i=1;i<=xMeta->getColumnCount();++i) { - const char *str = OUtoCStr(xMeta->getColumnName(i)); - OSL_TRACE( aPat, str ); + OSL_TRACE( aPat, OUtoCStr(xMeta->getColumnName(i) ); } OSL_TRACE("\n"); OSL_TRACE("------------------------------------------------------------------------------------------"); @@ -125,8 +124,7 @@ void printXResultSet( Reference<XResultSet> &xRes ) { try { - const char *str = OUtoCStr(xRow->getString(j)); - OSL_TRACE( aPat_Short, str ); + OSL_TRACE( aPat_Short, OUtoCStr(xRow->getString(j) ); } catch (...) { OSL_TRACE(" Ex "); } @@ -235,8 +233,7 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) while( xRes.is() && xRes->next()) { Reference<XRow> xRow(xRes,UNO_QUERY); - const char *strTableName = OUtoCStr(xRow->getString(3)); - OSL_TRACE("Testing Table:%s",strTableName); + OSL_TRACE("Testing Table:%s",OUtoCStr(xRow->getString(3)); Reference<XResultSet> tmpRes = xStmt->executeQuery(sqlPrefix + qut + xRow->getString(3) + qut); |