mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid possible memory leaks in case of exceptions

Browse Source 
Change-Id: I047fd88a89900153089a55b6af123f11fb8bde55
This commit is contained in:
Takeshi Abe
2014-04-24 00:09:19 +09:00
parent 2ea006fb60
commit 1ec8367608
4 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sal/cppunittester/cppunittester.cxx
View File

@@ -47,6 +47,7 @@
#include "boost/noncopyable.hpp"
#include "boost/ptr_container/ptr_vector.hpp"
#include <boost/scoped_array.hpp>
#include "boost/static_assert.hpp"
namespace {
@@ -108,9 +109,9 @@ class EyecatcherListener
public:
void startTest( CppUnit::Test* test) SAL_OVERRIDE
{
char* tn = new char [ test->getName().length() + 2 ];
strcpy(tn, test->getName().c_str());
int len = strlen(tn);
boost::scoped_array<char> tn(new char [ test->getName().length() + 2 ]);
strcpy(tn.get(), test->getName().c_str());
int len = strlen(tn.get());
for(int i = 0; i < len; i++)
{
if(!isalnum(tn[i]))
@@ -120,8 +121,7 @@ public:
}
tn[len] = '_';
tn[len + 1] = 0;
setenv("LO_TESTNAME", tn, true);
delete[] tn;
setenv("LO_TESTNAME", tn.get(), true);
}
void endTest( CppUnit::Test* /* test */ ) SAL_OVERRIDE