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

coverity#983054, reorder code to avoid memory leak

Browse Source 
Change-Id: If14160802f77673e3ebe69850e00d0506125969c
This commit is contained in:
Stephan Bergmann
2014-01-30 12:01:27 +01:00
parent 0b20f01a88
commit b1de7935b8
1 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
pyuno/source/module/pyuno.cxx
View File

@@ -741,36 +741,31 @@ PyObject* PyUNO_new_UNCHECKED (
const Any &targetInterface, const Any &targetInterface,
const Reference<XSingleServiceFactory> &ssf ) const Reference<XSingleServiceFactory> &ssf )
{ {
PyUNO* self;
Sequence<Any> arguments (1);
Reference<XInterface> tmp_interface; Reference<XInterface> tmp_interface;
Reference<XInvocation2> tmp_invocation;
self = PyObject_New (PyUNO, &PyUNOType); {
PyThreadDetach antiguard;
Sequence<Any> arguments(1);
arguments[0] <<= targetInterface;
tmp_interface = ssf->createInstanceWithArguments(arguments);
tmp_invocation.set(tmp_interface, UNO_QUERY);
if (!tmp_invocation.is() && tmp_interface.is()) {
throw RuntimeException(
"XInvocation2 not implemented, cannot interact with object",
Reference<XInterface>());
}
}
if (!tmp_interface.is())
{
Py_INCREF( Py_None );
return Py_None;
}
PyUNO* self = PyObject_New (PyUNO, &PyUNOType);
if (self == NULL) if (self == NULL)
return NULL; // == error return NULL; // == error
self->members = new PyUNOInternals(); self->members = new PyUNOInternals();
self->members->xInvocation = tmp_invocation;
arguments[0] <<= targetInterface; self->members->wrappedObject = targetInterface;
{
PyThreadDetach antiguard;
tmp_interface = ssf->createInstanceWithArguments (arguments);
if (!tmp_interface.is ())
{
Py_INCREF( Py_None );
return Py_None;
}
Reference<XInvocation2> tmp_invocation (tmp_interface, UNO_QUERY);
if (!tmp_invocation.is()) {
throw RuntimeException (OUString::createFromAscii (
"XInvocation2 not implemented, cannot interact with object"),
Reference< XInterface > ());
}
self->members->xInvocation = tmp_invocation;
self->members->wrappedObject = targetInterface;
}
return (PyObject*) self; return (PyObject*) self;
} }